Diego Mello c1d42d332a Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/debug/res/values/strings.xml # app/index.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-04-07 10:16:38 -03:00
..
database	Merge branch 'develop' into single-server	2020-04-07 10:16:38 -03:00
methods	[FIX] Loading all updated rooms after app resume (#1998)	2020-04-06 17:23:13 -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
createStore.js	[FIX] Remove console on production builds (#1124)	2019-08-13 10:03:46 -03:00
rocketchat.js	[FIX] Change user own status (#1995)	2020-04-06 16:32:58 -03:00
selection.json	[NEW] Discussions (#696)	2019-04-08 09:35:28 -03:00
utils.js	[NEW] Image Viewer (#1479)	2019-12-18 18:13:11 -03:00