Skip to content
Commit 727b6d16 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'master' into 'bvl-nfs-circuitbreaker' 

# Conflicts:
#   app/models/repository.rb
#   spec/models/repository_spec.rb
parents 4b34720c 440dc934
Hide whitespace changes
Inline Side-by-side
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