diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-12-18 12:59:09 +0000 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-12-18 12:59:09 +0000 |
| commit | a9d9895dc7b4c024471f49a61166a6bb402eab9e (patch) | |
| tree | a36edcc9449123a9fd4112dc18c5c18216ae07a1 /lib/gitlab/middleware/static.rb | |
| parent | b23f32a735459f1c76ac8232f9de06942b1d2f8a (diff) | |
| parent | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (diff) | |
| download | gitlab-ce-a9d9895dc7b4c024471f49a61166a6bb402eab9e.tar.gz | |
Merge branch 'master' into 'zj-mattermost-slash-config'
# Conflicts:
# config/gitlab.yml.example
# lib/mattermost/session.rb
# spec/lib/mattermost/session_spec.rb
Diffstat (limited to 'lib/gitlab/middleware/static.rb')
0 files changed, 0 insertions, 0 deletions