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
..
java/chat/rocket/reactnative	[NEW] Support client certificates for SSL (two-way authentication) (Android) (#2624)	2020-11-30 14:00:06 -03:00
res/xml	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
AndroidManifest.xml	[IMPROVEMENT] Ease white labelling for Android (#2685)	2020-12-04 13:17:29 -03:00