about summary refs log tree commit diff
path: root/app/javascript/images
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-23 15:23:12 +0100
committerGitHub <noreply@github.com>2018-12-23 15:23:12 +0100
commit8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa (patch)
treeb5d7908956cab9d18dceda381e18cdb4a6e0e4ba /app/javascript/images
parent1a3088364fe602bb48647d78dda440b174424e17 (diff)
parentcb98e7dbd35c730a58f65112c3fa32ee180a2518 (diff)
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/images')
-rw-r--r--app/javascript/images/icon_flag.svg4
-rw-r--r--app/javascript/images/mailer/icon_warning.pngbin0 -> 371 bytes
2 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/images/icon_flag.svg b/app/javascript/images/icon_flag.svg
new file mode 100644
index 000000000..3939c9d2b
--- /dev/null
+++ b/app/javascript/images/icon_flag.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M0 0h24v24H0z" fill="none"/>
+  <path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z"/>
+</svg>
diff --git a/app/javascript/images/mailer/icon_warning.png b/app/javascript/images/mailer/icon_warning.png
new file mode 100644
index 000000000..7baaac61c
--- /dev/null
+++ b/app/javascript/images/mailer/icon_warning.png
Binary files differ