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
..
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	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Info.plist	[NEW] Passcode and biometric unlock (#2059)	2020-05-08 14:04:37 -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