Merge branch 'develop' into google-natural-language-integration
Showing
- .editorconfig 4 additions, 0 deletions.editorconfig
- .eslintignore 1 addition, 0 deletions.eslintignore
- .eslintrc 11 additions, 3 deletions.eslintrc
- .github/PULL_REQUEST_TEMPLATE.md 5 additions, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- .meteor/packages 1 addition, 0 deletions.meteor/packages
- .meteor/versions 4 additions, 3 deletions.meteor/versions
- .sandstorm/launcher.sh 1 addition, 0 deletions.sandstorm/launcher.sh
- .sandstorm/sandstorm-pkgdef.capnp 4 additions, 3 deletions.sandstorm/sandstorm-pkgdef.capnp
- .snapcraft/edge/snapcraft.yaml 2 additions, 2 deletions.snapcraft/edge/snapcraft.yaml
- .snapcraft/stable/snapcraft.yaml 2 additions, 2 deletions.snapcraft/stable/snapcraft.yaml
- .stylelintrc 1 addition, 4 deletions.stylelintrc
- HISTORY.md 93 additions, 4 deletionsHISTORY.md
- README.md 2 additions, 2 deletionsREADME.md
- client/lib/handleError.js 1 addition, 1 deletionclient/lib/handleError.js
- client/methods/hideRoom.js 1 addition, 1 deletionclient/methods/hideRoom.js
- client/methods/leaveRoom.js 1 addition, 1 deletionclient/methods/leaveRoom.js
- client/methods/openRoom.js 1 addition, 1 deletionclient/methods/openRoom.js
- client/methods/setUserActiveStatus.js 1 addition, 1 deletionclient/methods/setUserActiveStatus.js
- client/methods/toggleFavorite.js 2 additions, 2 deletionsclient/methods/toggleFavorite.js
- client/methods/updateMessage.js 1 addition, 1 deletionclient/methods/updateMessage.js
Loading
Please register or sign in to comment