diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:29:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:29:19 +0100 |
| commit | 66a9579712a84061fa95d838760e8949538f44c8 (patch) | |
| tree | 2502e8f0edff0b30b66c7250b220c5d1f335ff4f /lib/api/entities.rb | |
| parent | acc35a58a7455a9107d6ebf2035f88350b1fb1ce (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-66a9579712a84061fa95d838760e8949538f44c8.tar.gz | |
Merge branch 'master' into ui/sidebarui/sidebar
# Conflicts:
# app/assets/stylesheets/framework/sidebar.scss
Diffstat (limited to 'lib/api/entities.rb')
0 files changed, 0 insertions, 0 deletions