Diego Mello 59bc3e8a46 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/sagas/login.js		2020-11-09 18:33:57 -03:00
..
Images.xcassets	[CHORE] Update Xcode to 12.1.0 (#2592)	2020-11-03 09:21:24 -03:00
AppDelegate.h	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
AppDelegate.m	[FIX] Logout when install fresh Official and Experimental iOS app (#2493)	2020-09-25 09:27:34 -03:00
Info.plist	[NEW] Threads (#2567)	2020-10-30 14:35:07 -03:00
RocketChatRN.entitlements	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
main.m	Initial commit	2017-08-03 15:23:43 -03:00