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
..
colors.js	[IMPROVEMENT] Apply new mention colors (#2351)	2020-07-29 17:49:08 -03:00
links.js	Move appStoreID to app.json	2020-03-11 17:27:45 -03:00
localAuthentication.js	[FIX] Screen Lock options i18n (#2120)	2020-05-18 14:35:21 -03:00
messagesStatus.js	Delete/resend message (#136)	2017-12-13 13:00:26 -02:00
settings.js	[CHORE] Add wrapper to make Meteor methods calls over REST (#2104)	2020-06-29 14:57:39 -03:00
tablet.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
userDefaults.js	[IMPROVEMENT] Share credentials with Rocket.Chat.iOS (#982)	2019-06-26 16:50:03 -03:00