summaryrefslogtreecommitdiff
path: root/lib/api/project_snippets.rb
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-02-20 15:47:34 -0800
committerMarin Jankovski <maxlazio@gmail.com>2015-02-20 15:47:34 -0800
commit51349ca3c83c56e072f87253d375316f7164b49a (patch)
tree0318216cc50a6a9b026a1b04cbffbe6b251fd739 /lib/api/project_snippets.rb
parentb180476bd69bdf99b1727b041116fa8447c0201f (diff)
parent2c9b35732409c2a73150788067e1b03b91101f39 (diff)
downloadgitlab-ce-51349ca3c83c56e072f87253d375316f7164b49a.tar.gz
Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx
Conflicts: lib/support/nginx/gitlab lib/support/nginx/gitlab-ssl
Diffstat (limited to 'lib/api/project_snippets.rb')
0 files changed, 0 insertions, 0 deletions