diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 13:44:00 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 13:44:00 +0200 |
| commit | 6f0c503397e184d2a68eec8d4285288abc29ce9a (patch) | |
| tree | a9542e11b94722c10cca41666b84714e8747e33e /app/models/application_setting.rb | |
| parent | b07dc938b9e8c9fa67b808a1bcf078bd30dc0db4 (diff) | |
| parent | 86e475101138d2db04d09606123b4f666b03bd39 (diff) | |
| download | gitlab-ce-6f0c503397e184d2a68eec8d4285288abc29ce9a.tar.gz | |
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
Diffstat (limited to 'app/models/application_setting.rb')
0 files changed, 0 insertions, 0 deletions