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
..
Header	Merge branch 'develop' into single-server	2020-07-17 10:41:23 -03:00
ListHeader	[IMPROVEMENT] Unified header UX (#2234)	2020-07-06 17:56:28 -03:00
SortDropdown	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
ServerDropdown.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
index.js	[FIX] Scroll to top crashing when ref is undefined (#2252)	2020-07-08 13:36:37 -03:00
styles.js	[IMPROVEMENT] Unified header UX (#2234)	2020-07-06 17:56:28 -03:00