summaryrefslogtreecommitdiff
path: root/app/assets/images
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-22 16:20:46 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-22 16:20:46 +0000
commit475715f18f03ff059618b42b3ecdf162cb419403 (patch)
tree334510d97b8460f3bd03260f414d9ffef9c3cde3 /app/assets/images
parent4753368d2f1bb62eab76bb3276f0859f8eec140d (diff)
parentc1e94479bd565a3deebe7452f186815157082cbb (diff)
downloadgitlab-ce-475715f18f03ff059618b42b3ecdf162cb419403.tar.gz
Merge branch 'feature/brand-logo-in-emails' into 'master'
Custom brand header logo in emails Closes #24969 and #25570 See merge request !9049
Diffstat (limited to 'app/assets/images')
-rw-r--r--app/assets/images/mailers/gitlab_footer_logo.gifbin0 -> 3654 bytes
-rw-r--r--app/assets/images/mailers/gitlab_header_logo.gifbin0 -> 3040 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/images/mailers/gitlab_footer_logo.gif b/app/assets/images/mailers/gitlab_footer_logo.gif
new file mode 100644
index 00000000000..3f4ef31947b
--- /dev/null
+++ b/app/assets/images/mailers/gitlab_footer_logo.gif
Binary files differ
diff --git a/app/assets/images/mailers/gitlab_header_logo.gif b/app/assets/images/mailers/gitlab_header_logo.gif
new file mode 100644
index 00000000000..387628f831c
--- /dev/null
+++ b/app/assets/images/mailers/gitlab_header_logo.gif
Binary files differ