verdnatura-chat/android
Diego Mello 3eb4545c6b Merge branch 'develop' into single-server
# Conflicts:
#	android/app/build.gradle
#	android/gradle.properties
#	app/sagas/init.js
#	app/sagas/login.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
2020-05-25 17:33:45 -03:00
..
app Merge branch 'develop' into single-server 2020-05-25 17:33:45 -03:00
gradle/wrapper Update all dependencies () 2020-05-08 13:37:49 -03:00
build.gradle Update all dependencies () 2020-05-08 13:37:49 -03:00
gradle.properties Merge branch 'develop' into single-server 2020-05-25 17:33:45 -03:00
gradlew Update all dependencies () 2020-05-08 13:37:49 -03:00
gradlew.bat [CHORE] Update to react-native 0.60.4 () 2019-08-07 10:51:34 -03:00
settings.gradle [REVERT] Show emoji keyboard on Android () 2020-02-17 09:14:56 -03:00