Diego Mello 4e437e3269 Merge branch 'develop' into single-server ... # Conflicts: # README.md # android/app/src/debug/AndroidManifest.xml # android/gradle.properties # app/views/RoomsListView/Header/Header.js # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/RocketChatRN.entitlements		2020-08-10 14:35:47 -03:00
..
app	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -03:00
fastlane	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
gradle/wrapper	[CHORE] Only run Flipper in debug via MainApplication is debug (#2347)	2020-07-30 09:18:48 -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	[FIX] Android targeting wrong SDK version (#2375)	2020-08-05 13:47:41 -03:00
gradle.properties	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -03:00
gradlew	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
gradlew.bat	Update dependencies (#2301)	2020-07-20 13:35:17 -03:00
settings.gradle	[REVERT] Show emoji keyboard on Android (#1738)	2020-02-17 09:14:56 -03:00