Merge branch 'master' into 'ce-to-ee'

# Conflicts: # app/models/repository.rb

Merge branch 'master' into 'ce-to-ee'
# Conflicts: # app/models/repository.rb
ff2445d0 · Dmitriy Zaporozhets · 7aa40b33 · e21257f7 · ff2445d0
Commit ff2445d0 authored Feb 13, 2017 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/repository.rb app/models/repository.rb +1 -1

No files found.
--- a/app/models/repository.rb
+++ b/app/models/repository.rb