lib/api/entities.rb · 623102d4556c42fd386e37724e638156dabca277 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge remote-tracking branch 'origin/master' into docker-registry · 0958f331
Kamil Trzcinski authored May 13, 2016
```
# Conflicts:
#	config/initializers/1_settings.rb
```
0958f331

entities.rb 13.6 KB