diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
commit | 3d51a6d4351c6a15c92762f5710a967374d0c59b (patch) | |
tree | 10c5e87e0add51ef0bdcc9be42ac0176907a080c /lib/gitlab.rb | |
parent | 8ec5fb138dde9937814ac138352177399d3e776d (diff) | |
parent | 8819007c83fdf1ac642836640a37cc541f6eddc6 (diff) | |
download | gitlab-ce-3d51a6d4351c6a15c92762f5710a967374d0c59b.tar.gz |
Merge branch 'master' into reply-by-email
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r-- | lib/gitlab.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 5fc1862c3e9..6108697bc20 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -1,5 +1,4 @@ require 'gitlab/git' module Gitlab - autoload :Satellite, 'gitlab/satellite/satellite' end |