Diego Mello 3ddbe6cc8e Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/gradle.properties # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-12-15 15:38:04 -03:00
..
colors.js	[NEW] Threads (#2567)	2020-10-30 14:35:07 -03:00
environment.js	[CHORE] Build official apps on CI (#2701)	2020-12-14 13:20:32 -03:00
links.js	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -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	[FIX] App always sends auth for Avatar requests (#2517)	2020-10-30 12:54:02 -03:00
tablet.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00