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
..
app	Merge branch 'develop' into single-server	2020-04-07 10:16:38 -03:00
gradle/wrapper	Update React Native to 0.61.1 (#1236)	2019-09-26 11:59:27 -03:00
build.gradle	[NEW] Enable Hermes (#1446)	2019-12-11 16:23:16 -03:00
gradle.properties	Signing config on gradle.properties	2020-03-12 13:18:06 -03:00
gradlew	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -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