Skip to content
Snippets Groups Projects
Commit 6024697c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'master' into 'dz-rename-reserved-project-names'

# Conflicts:
#   db/schema.rb
parents 123bc1d5 f264ec6e
No related branches found
No related tags found
No related merge requests found
Showing
with 57 additions and 59 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