Skip to content
Snippets Groups Projects
Commit e277b8e0 authored by Gary Chapman's avatar Gary Chapman
Browse files

Merge branch 'develop' into feature/read-only-rooms

# Conflicts:
#	packages/rocketchat-authorization/server/startup.coffee
parents 83347de1 65fa4e94
No related branches found
No related tags found
No related merge requests found
Showing
with 246 additions and 205 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment