diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-05 20:15:32 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-05 20:15:32 +0100 |
| commit | 170ca8435a6b881231476b372122cf7e5b028736 (patch) | |
| tree | b3c762ef01268462b0b674b2d7f353e2a3a6cf48 /lib/api/variables.rb | |
| parent | a7c441aa17ba64eb702b583ac9198cdace599d2e (diff) | |
| parent | 3a98279243e7a49a334c7eb6f806cd2b2072fbed (diff) | |
| download | gitlab-ce-170ca8435a6b881231476b372122cf7e5b028736.tar.gz | |
Merge branch 'master' into ci-permissions
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/variables.rb')
0 files changed, 0 insertions, 0 deletions