Skip to content
Snippets Groups Projects
Commit 5698c31d authored by Marcelo Schmidt's avatar Marcelo Schmidt
Browse files

Merge branch 'develop' into channel-settings 

Conflicts:
	packages/rocketchat-channel-settings/server/methods/saveRoomSettings.coffee
	packages/rocketchat-lib/server/models/Rooms.coffee
	packages/rocketchat-ui/lib/RoomManager.coffee
	server/startup/roomPublishes.coffee
parents 45a85e5f 3159a8fe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 79 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment