Diego Mello b456e779a0 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/index.js # app/sagas/init.js # app/sagas/login.js # app/views/RoomsListView/Header/Header.ios.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-07-06 16:04:58 -03:00
..
src	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -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.8.0 (#2147)	2020-05-26 17:22:56 -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