Diego Mello b456e779a0 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/index.js # app/sagas/init.js # app/sagas/login.js # app/views/RoomsListView/Header/Header.ios.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-07-06 16:04:58 -03:00
..
xcshareddata/xcschemes	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
project.pbxproj	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00