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
..
app	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00
fastlane	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
gradle/wrapper	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
Gemfile	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
Gemfile.lock	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
build.gradle	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
gradle.properties	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00
gradlew	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
gradlew.bat	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -03:00
settings.gradle	[REVERT] Show emoji keyboard on Android (#1738)	2020-02-17 09:14:56 -03:00