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
..
model	[NEW] Livechat (#2004)	2020-05-08 14:36:10 -03:00
schema	[NEW] Livechat (#2004)	2020-05-08 14:36:10 -03:00
index.js	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
utils.js	[CHORE] Migrate to Watermelon (#1171)	2019-09-16 17:26:32 -03:00