diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:53:31 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:53:31 -0700 |
| commit | 843694f90270e290f164bed68362500c9e331a46 (patch) | |
| tree | 0e20cc09df536365db817ba8aef4c77d3d0c684e /.gitignore | |
| parent | 6afd69f4445cc0688aa1695389eb3f79033e3121 (diff) | |
| parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) | |
| download | gitlab-ce-843694f90270e290f164bed68362500c9e331a46.tar.gz | |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index aff8ad9ecbe..39caad149b3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ config/aws.yml config/database.yml config/gitlab.yml config/gitlab_ci.yml -config/initializers/omniauth.rb config/initializers/rack_attack.rb config/initializers/smtp_settings.rb config/resque.yml |