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
..
src	Merge branch 'develop' into single-server	2020-12-15 15:38:04 -03:00
_BUCK	[UPDATE DEPS] Update RN to 0.61.3 (#1345)	2019-10-31 13:21:59 -03:00
build.gradle	Merge branch 'develop' into single-server	2020-12-15 15:38:04 -03:00
build_defs.bzl	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -03:00
google-services.json	[CHORE] Build official apps on CI (#2701)	2020-12-14 13:20:32 -03:00
proguard-rules.pro	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -03:00