There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'origin/develop' into update
# Conflicts: # app/views/LoginView.js # app/views/RegisterView.js
No related branches found
No related tags found
Showing
- app/actions/actionsTypes.js 9 additions, 1 deletionapp/actions/actionsTypes.js
- app/actions/login.js 12 additions, 0 deletionsapp/actions/login.js
- app/actions/server.js 6 additions, 0 deletionsapp/actions/server.js
- app/containers/Routes.js 8 additions, 2 deletionsapp/containers/Routes.js
- app/containers/Sidebar.js 14 additions, 3 deletionsapp/containers/Sidebar.js
- app/containers/routes/NavigationService.js 23 additions, 0 deletionsapp/containers/routes/NavigationService.js
- app/containers/routes/PublicRoutes.js 15 additions, 0 deletionsapp/containers/routes/PublicRoutes.js
- app/lib/rocketchat.js 14 additions, 0 deletionsapp/lib/rocketchat.js
- app/reducers/login.js 10 additions, 0 deletionsapp/reducers/login.js
- app/sagas/init.js 8 additions, 1 deletionapp/sagas/init.js
- app/sagas/login.js 26 additions, 31 deletionsapp/sagas/login.js
- app/sagas/selectServer.js 11 additions, 2 deletionsapp/sagas/selectServer.js
- app/views/LoginView.js 27 additions, 10 deletionsapp/views/LoginView.js
- app/views/PrivacyPolicyView.js 28 additions, 0 deletionsapp/views/PrivacyPolicyView.js
- app/views/RegisterView.js 9 additions, 8 deletionsapp/views/RegisterView.js
- app/views/TermsServiceView.js 28 additions, 0 deletionsapp/views/TermsServiceView.js
Loading
Please register or sign in to comment