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
..
Header	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -03:00
ListHeader	[NEW] Omnichannel inquiry queue (#2352)	2020-07-31 15:22:30 -03:00
SortDropdown	[NEW] Log events from Room, Settings and Edit status (#2206)	2020-07-30 16:51:13 -03:00
ServerDropdown.js	[NEW] Log events from RoomsList, SideDrawer and Profile (#2190)	2020-07-30 10:26:17 -03:00
index.js	[NEW] Log remaining events (#2368)	2020-08-05 10:15:56 -03:00
styles.js	[IMPROVEMENT] Unified header UX (#2234)	2020-07-06 17:56:28 -03:00