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
..
Images.xcassets	[NEW] Onboarding layout (#1954)	2020-03-30 16:20:50 -03:00
AppDelegate.h	[IMPROVEMENT] Use expo-web-browser (#992)	2019-06-21 13:39:20 -03:00
AppDelegate.m	[CHORE] Use storyboard on splash screen (#1939)	2020-03-26 10:21:21 -03:00
Info.plist	Bump version to 4.6.1 (#2001)	2020-04-06 18:52:06 -03:00
RocketChatRN.entitlements	Remove universal URL	2020-03-11 16:23:02 -03:00
main.m	Initial commit	2017-08-03 15:23:43 -03:00