Diego Mello b456e779a0 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/index.js # app/sagas/init.js # app/sagas/login.js # app/views/RoomsListView/Header/Header.ios.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-07-06 16:04:58 -03:00
..
Header	[NEW] Custom Status (#1811)	2020-03-30 17:19:01 -03:00
index.js	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00
styles.js	[NEW] Send multiple attachments (#2162)	2020-06-26 17:22:56 -03:00