Diego Mello 3eb4545c6b Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/gradle.properties # app/sagas/init.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-05-25 17:33:45 -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-05-25 17:33:45 -03:00