Diego Mello c1d42d332a Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/debug/res/values/strings.xml # app/index.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-04-07 10:16:38 -03:00
..
model	[NEW] Direct Message between multiple users (#1958)	2020-04-01 09:28:54 -03:00
schema	[NEW] Direct Message between multiple users (#1958)	2020-04-01 09:28:54 -03:00
index.js	Merge branch 'develop' into single-server	2020-04-07 10:16:38 -03:00
utils.js	[CHORE] Migrate to Watermelon (#1171)	2019-09-16 17:26:32 -03:00