Merge branch 'master' into 'port-i18n-for-mirrors-instructions'
# Conflicts: # app/views/projects/mirrors/_instructions.html.haml
Showing
File moved
File moved
app/helpers/mirror_helper.rb
0 → 100644
Please register or sign in to comment