Merge branch 'dev' into #297

WhitestormJS · Jul 30, 2017 · e717ad5 · e717ad5
2 parents d02dab1 + 5e4d092
commit e717ad5
Show file tree

Hide file tree

Showing 46 changed files with 1,607 additions and 2,866 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,5 +40,6 @@ deploy:
  api_key:
  secure: "a9xwVrOp4nA1NsgDtB4Bx82PPHGex2on/AzfrAoCouX4sWeetYiW7/poYKtWE5VwMw57Cr1JJ99NRngOt/hZkTNHq8AGy/Kt2QynSV/tilY2SHQ+6pWzCxJGkWhLBDtzKqvxnCS4kGJEKD8lAEEm/6DwPkP0LL3Hyj81MyTNTZGLYY8wjFeaNHPfgqmJ+QBmN6WOwDyFl+YL7A7fuHVm/60sYvUM3gmUuEh1yBIPPD9Qw8T4NLJTnRtTQbLG9oo3UKhTrxv/SBDZzjtX6KNXlEyE8IM/F2xawnfUgjWFP7ie827yF+fwQfEu+0iJnkoE089YBeKbGoy4QUyrhBA+kBRcNeOOw1/mTJCVh2AVLHttmi4du5PODjP+Ag5susT/FU6vXjC01RUZaWJQLeYbB3F3+EnPzYTKNuFRPmKKIi8r4JrJG7ypGxtv9dXOtB5tcGR+XfCDCpHhIxwL0ZwGC9aRzzyMz2ECDi7qpmqAjPtIZW+W4REVNXrMgdg2cO753NsI/DJLMZ5sM2SpW3ZSTdVYUcbBMUKXZGdOyAOUVKeQ7AFX5sOaz0cqv5OsqRJSebq2ARQ9zVa4NUIXjw30F5qAV8Anqmur8IHRgFReVa9nIBi499soTUlEZshmR7YwaMIn1iJPyz7mbnY5VAw2XIHkNLRomWEzaoMI2v8HvfA="
  on:
- branch: dev
+ branch: master
  tags: true
+ skip_cleanup: true