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	[NEW] Custom Status (#1811)	2020-03-30 17:19:01 -03:00
index.js	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -03:00
styles.js	[NEW] Send multiple attachments (#2162)	2020-06-26 17:22:56 -03:00