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
..
MasterDetailStack	[NEW] Omnichannel inquiry queue (#2352)	2020-07-31 15:22:30 -03:00
InsideStack.js	[NEW] Omnichannel inquiry queue (#2352)	2020-07-31 15:22:30 -03:00
OutsideStack.js	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00