Diego Mello 2bdfdba027 Merge branch 'develop' into single-server ... # Conflicts: # ios/RocketChatRN.xcodeproj/project.pbxproj		2021-01-07 10:23:00 -03:00
..
app	Merge branch 'develop' into single-server	2021-01-07 10:23:00 -03:00
fastlane	[CHORE] Build official apps on CI (#2701)	2020-12-14 13:20:32 -03:00
gradle/wrapper	[IMPROVEMENT] Jitsi lean (#2534)	2020-11-03 11:18:15 -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 to F-Droid (#2171)	2020-08-24 09:24:10 -03:00
build.gradle	[REGRESSION] Re-enable Jitsi Chat (#2687)	2020-12-04 19:18:55 -03:00
gradle.properties	[FIX] APPLICATION_ID typo (#2729)	2020-12-21 17:56:35 -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	[FIX] Messages overlapping and emoji keyboard not opening (#2670)	2020-12-01 08:58:51 -03:00