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
..
database	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -03:00
methods	[NEW] Log remaining events (#2368)	2020-08-05 10:15:56 -03:00
Icons.js	Switch to react-navigation (#687)	2019-03-12 13:23:06 -03:00
Navigation.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
ShareNavigation.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
appStateMiddleware.js	[NEW] Passcode and biometric unlock (#2059)	2020-05-08 14:04:37 -03:00
createStore.js	[NEW] Passcode and biometric unlock (#2059)	2020-05-08 14:04:37 -03:00
rocketchat.js	[FIX] Quote not working on Group DM (#2372)	2020-08-05 13:48:46 -03:00
selection.json	[CHORE] Update icon names (#2318)	2020-07-27 16:53:33 -03:00
utils.js	[NEW] Image Viewer (#1479)	2019-12-18 18:13:11 -03:00