Diego Mello be40312fe6 Merge branch 'improvement.move-to-ee' into no-ee ... # Conflicts: # app/sagas/index.js # app/sagas/login.js # app/sagas/selectServer.js # app/views/RoomView/index.js # app/views/RoomsListView/ListHeader/index.js # app/views/RoomsListView/index.js		2020-08-28 11:06:24 -03:00
..
ModalContainer.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
index.js	Merge branch 'improvement.move-to-ee' into no-ee	2020-08-28 11:06:24 -03:00