Diego Mello 6f64babbd6 Merge branch 'single-server' into single-server-4.30 ... # Conflicts: # app/containers/UIKit/HeaderButtons.js # app/views/RoomsListView/Header/Header.tsx # ios/RocketChatRN.xcodeproj/project.pbxproj # yarn.lock		2022-09-12 11:23:19 -03:00
..
app	Merge branch 'single-server' into single-server-4.30	2022-09-12 11:23:19 -03:00
fastlane	Merge 4.19.0 into single-server (#3360)	2021-08-31 17:35:31 -03:00
gradle/wrapper	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00
Gemfile	[NEW] Add fastlane to android module and configure CI (#2100)	2020-06-16 10:31:07 -03:00
Gemfile.lock	Chore: Update gems (#4318)	2022-06-24 17:50:44 -03:00
build.gradle	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00
gradle.properties	Merge branch 'single-server' into single-server-4.30	2022-09-12 11:23:19 -03:00
gradlew	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00
gradlew.bat	Merge 4.19.0 into single-server (#3360)	2021-08-31 17:35:31 -03:00
settings.gradle	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00