Diego Mello c1d42d332a Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/debug/res/values/strings.xml # app/index.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-04-07 10:16:38 -03:00
..
src/main	Merge branch 'develop' into single-server	2020-04-07 10:16:38 -03:00
_BUCK	[UPDATE DEPS] Update RN to 0.61.3 (#1345)	2019-10-31 13:21:59 -03:00
build.gradle	Bump version to 4.6.1 (#2001)	2020-04-06 18:52:06 -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