Marin Jankovski 51349ca3c8 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		2015-02-20 15:47:34 -08:00
..
gitlab	Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx	2015-02-20 15:47:34 -08:00
gitlab-ssl	Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx	2015-02-20 15:47:34 -08:00