Merge git://github.com/tootsuite/mastodon into tootsuite-master

8 files changed, 2 insertions, 2 deletions

diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 3a475f61f..0b4eb9fdf 100644
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
Binary files differdiff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index b05996b37..829263f83 100644
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
Binary files differdiff --git a/public/badge.png b/public/badge.png
index fc1f42dca..a1f2f8b08 100644
--- a/public/badge.png
+++ b/public/badge.png
Binary files differdiff --git a/public/browserconfig.xml b/public/browserconfig.xml
index fcf794bc2..7fdab5058 100644
--- a/public/browserconfig.xml
+++ b/public/browserconfig.xml
@@ -3,7 +3,7 @@
   <msapplication>
     <tile>
       <square150x150logo src="/mstile-150x150.png"/>
-      <TileColor>#1ea21e</TileColor>
+      <TileColor>#282c37</TileColor>
     </tile>
   </msapplication>
 </browserconfig>
diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
index 5f725d587..383604406 100644
--- a/public/favicon-dev.ico
+++ b/public/favicon-dev.ico
Binary files differdiff --git a/public/favicon.ico b/public/favicon.ico
index 3673ac0d5..79000c9cc 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differdiff --git a/public/mask-icon.svg b/public/mask-icon.svg
index c35230117..f91ff5067 100644
--- a/public/mask-icon.svg
+++ b/public/mask-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><path d="M8 .1A7.9 7.9 0 0 0 .1 8 7.9 7.9 0 0 0 8 15.9 7.9 7.9 0 0 0 15.9 8 7.9 7.9 0 0 0 8 .1zm-.04 4.28h1.7c-.33.23-.44.9-.44 1.25v3.2c0 .7-.55 1.24-1.26 1.24-.7 0-1.26-.55-1.26-1.25v-3.2c0-.68.55-1.24 1.26-1.24zm-4.36.78c.7 0 1.26.55 1.26 1.24v3.2c0 .34.1 1.02.43 1.24H3.6c-.7 0-1.26-.55-1.26-1.24V6.4c0-.7.55-1.24 1.26-1.24zm8.7 0c.7 0 1.26.55 1.26 1.24v3.2c0 .7-.56 1.24-1.27 1.24h-1.7c.32-.22.43-.9.43-1.24V6.4c0-.7.56-1.24 1.26-1.24z" fill="#000"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.023018 100.80365" height="28.44903mm" width="26.535385mm"><path d="M72.57077 49.00625c-3.9125 0-7.085-3.1825-7.085-7.095 0-3.91125 3.1725-7.09375 7.085-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m-25.55875 0c-3.9225 0-7.095-3.1825-7.095-7.095 0-3.91125 3.1725-7.09375 7.095-7.09375 3.91125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1825 7.095-7.09375 7.095m-25.57 0c-3.91125 0-7.08375-3.1825-7.08375-7.095 0-3.91125 3.1725-7.09375 7.08375-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m72.5775-15.905c0-21.86625-14.32375-28.27375-14.32375-28.27375-7.23-3.31875-19.63-4.7125-32.5175-4.8275h-.3125c-12.88875.115-25.28875 1.50875-32.5075 4.8275 0 0-14.32375 6.4075-14.32375 28.27375 0 5.00375-.105 10.995.05125 17.34C.60577 71.83 4.00702 92.905 23.78327 98.1375c9.1125 2.4125 16.945 2.9125 23.24875 2.56875 11.4225-.63375 17.84-4.07625 17.84-4.07625l-.37375-8.3025s-8.16625 2.58-17.34125 2.2675c-9.09125-.3125-18.6825-.9775-20.16-12.13875-.135-.97875-.1975-2.02875-.1975-3.13125 0 0 8.915 2.185 20.2325 2.69375 6.9075.3225 13.39875-.39375 19.98375-1.185 12.6275-1.50875 23.62375-9.29 25.0075-16.405 2.17375-11.1925 1.99625-27.3275 1.99625-27.3275" fill="#000"/></svg>
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index 57eae8355..e8e289eaa 100644
--- a/public/mstile-150x150.png
+++ b/public/mstile-150x150.png
Binary files differ