James Lopez c9be4d65f2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci ... # Conflicts: # .gitlab-ci.yml		2016-02-18 11:12:26 +01:00
..
notify_slack.sh	removed slack task and added bash script instead. Updated gitlab-ci config file	2016-02-05 11:04:13 +01:00
prepare_build.sh	Use caching, instead of haxxy /cache	2016-02-10 16:53:55 +01:00