diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-01-26 22:12:53 -0800 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-01-26 22:12:53 -0800 |
| commit | 0da59cb55bfc8b6bb50f45d0ccdb19edc8b0a6e9 (patch) | |
| tree | 52a372f621a96f5261f926968141313f29cf6da3 /lib/api/project_snippets.rb | |
| parent | 33913f9b8fef1f8df45dc26239faf8fa4cffc982 (diff) | |
| parent | e6b97d09470b01b5b65e87dab339c500f1bac45f (diff) | |
| download | gitlab-ce-0da59cb55bfc8b6bb50f45d0ccdb19edc8b0a6e9.tar.gz | |
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
Conflicts:
app/models/project.rb
spec/models/project_spec.rb
Diffstat (limited to 'lib/api/project_snippets.rb')
0 files changed, 0 insertions, 0 deletions