Diego Mello c62346fb2d Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/views/RoomsListView/Header/Header.ios.js		2020-07-17 10:41:23 -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-07-17 10:41:23 -03:00
utils.js	[CHORE] Migrate to Watermelon (#1171)	2019-09-16 17:26:32 -03:00