-
- Downloads
Merge branch 'master' of github.com:RocketChat/Rocket.Chat into standalone-package-testing
Conflicts: .meteor/packages .meteor/versions .travis.yml
Showing
- .meteor/packages 23 additions, 21 deletions.meteor/packages
- .meteor/versions 3 additions, 4 deletions.meteor/versions
- .travis.yml 3 additions, 7 deletions.travis.yml
- .travis/setbuildinfo.js 18 additions, 23 deletions.travis/setbuildinfo.js
- README.md 29 additions, 18 deletionsREADME.md
- build-old.sh 10 additions, 0 deletionsbuild-old.sh
- build.sh 12 additions, 5 deletionsbuild.sh
- client/lib/accountBox.coffee 3 additions, 3 deletionsclient/lib/accountBox.coffee
- client/lib/fileUpload.coffee 2 additions, 0 deletionsclient/lib/fileUpload.coffee
- client/lib/sideNav.coffee 2 additions, 2 deletionsclient/lib/sideNav.coffee
- client/views/admin/users/adminUsers.coffee 6 additions, 0 deletionsclient/views/admin/users/adminUsers.coffee
- client/views/admin/users/adminUsers.html 25 additions, 15 deletionsclient/views/admin/users/adminUsers.html
- client/views/app/messagePopup.coffee 4 additions, 4 deletionsclient/views/app/messagePopup.coffee
- client/views/app/room.coffee 3 additions, 0 deletionsclient/views/app/room.coffee
- client/views/app/room.html 2 additions, 2 deletionsclient/views/app/room.html
- client/views/app/sideNav/sideNav.html 1 addition, 1 deletionclient/views/app/sideNav/sideNav.html
- client/views/app/sideNav/userStatus.html 1 addition, 1 deletionclient/views/app/sideNav/userStatus.html
- client/views/app/tabBar/membersList.html 2 additions, 2 deletionsclient/views/app/tabBar/membersList.html
- client/views/login/form.coffee 1 addition, 3 deletionsclient/views/login/form.coffee
- client/views/login/services.coffee 0 additions, 2 deletionsclient/views/login/services.coffee
Loading
Please register or sign in to comment