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
..
xcshareddata/xcschemes	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
project.pbxproj	Merge branch 'develop' into single-server	2020-07-17 10:41:23 -03:00