diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 13:19:53 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 13:19:53 +0200 |
| commit | 50076ab974348e74514bb4f19169351f08e11636 (patch) | |
| tree | f3ba725e2170e58513995fe941fef30ac13afb45 /lib/api/internal.rb | |
| parent | 11f87700e8bceeec96440809682406ae24334ed8 (diff) | |
| parent | 4768521a6e9d6d8b9a57398ebb5d03aed5b5ac77 (diff) | |
| download | gitlab-ce-50076ab974348e74514bb4f19169351f08e11636.tar.gz | |
Merge remote-tracking branch 'origin/master' into per-build-token
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/internal.rb')
0 files changed, 0 insertions, 0 deletions