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
..
model	[IMPROVEMENT] Add deep link to Jitsi calls (#2223)	2020-07-30 14:25:52 -03:00
schema	[IMPROVEMENT] Add deep link to Jitsi calls (#2223)	2020-07-30 14:25:52 -03:00
index.js	Merge branch 'develop' into single-server	2020-07-17 10:41:23 -03:00
utils.js	[CHORE] Migrate to Watermelon (#1171)	2019-09-16 17:26:32 -03:00