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
..
src	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -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-08-10 14:35:47 -03:00
build_defs.bzl	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -03:00
proguard-rules.pro	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -03:00