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
..
colors.js	[NEW] Themes (#1298)	2019-12-04 13:39:53 -03:00
links.js	Move appStoreID to app.json	2020-03-11 17:27:45 -03:00
messagesStatus.js	Delete/resend message (#136)	2017-12-13 13:00:26 -02:00
settings.js	[FIX] Correct message for manual approval user Registration (#1906)	2020-04-01 17:43:49 -03:00
tablet.js	[NEW] Onboarding layout (#1954)	2020-03-30 16:20:50 -03:00
types.js	[FIX] Clear settings on server change (#1967)	2020-04-01 16:24:42 -03:00
userDefaults.js	[IMPROVEMENT] Share credentials with Rocket.Chat.iOS (#982)	2019-06-26 16:50:03 -03:00