Diego Mello c62346fb2d Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/views/RoomsListView/Header/Header.ios.js		2020-07-17 10:41:23 -03:00
..
database	Merge branch 'develop' into single-server	2020-07-17 10:41:23 -03:00
methods	[FIX] getSettings not catching errors (#2271)	2020-07-09 10:33:04 -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	[NEW] Sign in with Apple (#2282)	2020-07-14 13:07:45 -03:00
selection.json	[IMPROVEMENT] Refactor icon package (#2146)	2020-06-05 10:28:58 -03:00
utils.js	[NEW] Image Viewer (#1479)	2019-12-18 18:13:11 -03:00