Diego Mello c1d42d332a Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/debug/res/values/strings.xml # app/index.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-04-07 10:16:38 -03:00
..
xcshareddata/xcschemes	[CHORE] Use storyboard on splash screen (#1939)	2020-03-26 10:21:21 -03:00
project.pbxproj	Merge branch 'develop' into single-server	2020-04-07 10:16:38 -03:00