Diego Mello 3eb4545c6b Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/gradle.properties # app/sagas/init.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-05-25 17:33:45 -03:00
..
Header	[NEW] Custom Status (#1811)	2020-03-30 17:19:01 -03:00
index.js	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
styles.js	[NEW] Themes (#1298)	2019-12-04 13:39:53 -03:00