lib/api/entities.rb · c95cca9de7cc7c0082cceb40721ed21727b36ef6 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee · c4e713a5
Dmitriy Zaporozhets authored Apr 22, 2014
```
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
```
c4e713a5

entities.rb 5.68 KB