Diego Mello b456e779a0 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/index.js # app/sagas/init.js # app/sagas/login.js # app/views/RoomsListView/Header/Header.ios.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-07-06 16:04:58 -03:00
..
createChannel.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
createDiscussion.js	[NEW] Create discussions (#1942)	2020-03-30 16:50:27 -03:00
deepLinking.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
index.js	[NEW] Create discussions (#1942)	2020-03-30 16:50:27 -03:00
init.js	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00
inviteLinks.js	[NEW] Invite links (#1534)	2020-01-28 10:22:35 -03:00
login.js	Merge branch 'develop' into single-server	2020-07-06 16:04:58 -03:00
messages.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
room.js	[NEW] Omnichannel Status Toggle (#2217)	2020-06-26 17:45:21 -03:00
rooms.js	[FIX] Delete Subs (#2091)	2020-05-08 14:36:55 -03:00
selectServer.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
state.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00