Diego Mello 4e437e3269 Merge branch 'develop' into single-server ... # Conflicts: # README.md # android/app/src/debug/AndroidManifest.xml # android/gradle.properties # app/views/RoomsListView/Header/Header.js # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/RocketChatRN.entitlements		2020-08-10 14:35:47 -03:00
..
Images.xcassets	[IMPROVEMENT] Refactor icon package (#2146)	2020-06-05 10:28:58 -03:00
AppDelegate.h	[IMPROVEMENT] Use expo-web-browser (#992)	2019-06-21 13:39:20 -03:00
AppDelegate.m	[CHORE] Update react-native-firebase (#2336)	2020-07-24 10:19:17 -03:00
Info.plist	Bump version to 4.10.0 (#2305)	2020-07-16 17:06:37 -03:00
RocketChatRN.entitlements	[IMPROVEMENT] Add deep link to Jitsi calls (#2223)	2020-07-30 14:25:52 -03:00
main.m	Initial commit	2017-08-03 15:23:43 -03:00