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
..
database	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
methods	[FIX] Screen Lock Time respect local value (#2141)	2020-05-22 15:04:43 -03:00
Icons.js	Switch to react-navigation (#687)	2019-03-12 13:23:06 -03:00
ModalNavigation.js	[NEW] Tablet support (#1300)	2019-11-25 17:01:17 -03:00
Navigation.js	[FIX] UIKit submit when connection lost (#1748)	2020-02-18 12:56:02 -03:00
ShareNavigation.js	[FIX] Share Extension issues (#1064)	2019-07-29 13:33:28 -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] Sometimes SDK is null when try to connect (#2131)	2020-05-18 14:55:53 -03:00
selection.json	[NEW] Passcode and biometric unlock (#2059)	2020-05-08 14:04:37 -03:00
utils.js	[NEW] Image Viewer (#1479)	2019-12-18 18:13:11 -03:00