summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-02-29 11:10:03 +0100
committerDouwe Maan <douwe@selenight.nl>2016-02-29 11:10:03 +0100
commit84473c75134cb9d151c3a2e5f572b77f910573f7 (patch)
tree2d9925b275f78c964e79344ccffd3d87dd9b0d52 /config
parente1baa48584011772e6068a076e2f11ffaee88970 (diff)
parentf838dbe4d13c55fc8796eadf33165f1406612662 (diff)
downloadgitlab-ce-84473c75134cb9d151c3a2e5f572b77f910573f7.tar.gz
Merge branch 'master' into mail-room-config-without-railsmail-room-config-without-rails
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions