Manuel Friedli cda31b9104 Merge branch 'master' into feature/cleanup-gitlab ... Conflicts: dev-vcs/gitlab-shell/Manifest dev-vcs/gitlab-workhorse/Manifest www-apps/gitlab-ce/Manifest		2016-01-15 20:51:38 +01:00
..
gitlab-ce	Merge branch 'master' into feature/cleanup-gitlab	2016-01-15 20:51:38 +01:00