summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-03 18:43:48 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-03 18:43:48 +0000
commit9f0349ae39fd69c142e03c1da061228bf7965160 (patch)
tree0c0c67b5aeb380521f534c156edec04240958df3 /lib/api/files.rb
parentf2f35849adc609efff2a3ba16ecb747d36a45e7c (diff)
parent29169696a2c5b3239b1a9ac8b9f048a3909a8a3c (diff)
downloadgitlab-ce-9f0349ae39fd69c142e03c1da061228bf7965160.tar.gz
Merge branch 'email-settings' into 'master'
Emails settings Closes #13857 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87ee4b0abf970c1fbb5e8a8c02740c/email-settings.png) See merge request !3032
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions