merveilles · mashaal · Dec 23, 2018 · Dec 23, 2018 · Mar 17, 2019 · Apr 8, 2019
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,7 @@
-patreon: mastodon
-open_collective: mastodon
-custom: https://sponsor.joinmastodon.org
+# Linking to Merveilles funding, Mastodon funding, & dariusk from Hometown
+patreon: merveillestown
+open_collective: merveilles
+ko_fi: merveillestown
+liberapay: merveilles
+github: [Gargron, dariusk]
+custom: ['https://www.patreon.com/mastodon', 'https://opencollective.com/mastodon', 'https://www.patreon.com/tinysubversions', 'https://sponsor.joinmastodon.org']
diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb
@@ -19,16 +19,16 @@ def _logo_as_symbol_icon
   end
 
   def render_logo
-    image_pack_tag('logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
+    image_pack_tag('merveilles-logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
   end
 
   def render_symbol(version = :icon)
     path = begin
       case version
       when :icon
-        'logo-symbol-icon.svg'
+        'merveilles-logo-symbol-icon.svg'
       when :wordmark
-        'logo-symbol-wordmark.svg'
+        'merveilles-logo-symbol-wordmark.svg'
       end
     end
 

diff --git a/app/javascript/icons/android-chrome-144x144.png b/app/javascript/icons/android-chrome-144x144.png
diff --git a/app/javascript/icons/android-chrome-192x192.png b/app/javascript/icons/android-chrome-192x192.png
diff --git a/app/javascript/icons/android-chrome-256x256.png b/app/javascript/icons/android-chrome-256x256.png
diff --git a/app/javascript/icons/android-chrome-36x36.png b/app/javascript/icons/android-chrome-36x36.png
diff --git a/app/javascript/icons/android-chrome-384x384.png b/app/javascript/icons/android-chrome-384x384.png
diff --git a/app/javascript/icons/android-chrome-48x48.png b/app/javascript/icons/android-chrome-48x48.png
diff --git a/app/javascript/icons/android-chrome-512x512.png b/app/javascript/icons/android-chrome-512x512.png
diff --git a/app/javascript/icons/android-chrome-72x72.png b/app/javascript/icons/android-chrome-72x72.png
diff --git a/app/javascript/icons/android-chrome-96x96.png b/app/javascript/icons/android-chrome-96x96.png
diff --git a/app/javascript/icons/apple-touch-icon-1024x1024.png b/app/javascript/icons/apple-touch-icon-1024x1024.png
diff --git a/app/javascript/icons/apple-touch-icon-114x114.png b/app/javascript/icons/apple-touch-icon-114x114.png
diff --git a/app/javascript/icons/apple-touch-icon-120x120.png b/app/javascript/icons/apple-touch-icon-120x120.png
diff --git a/app/javascript/icons/apple-touch-icon-144x144.png b/app/javascript/icons/apple-touch-icon-144x144.png
diff --git a/app/javascript/icons/apple-touch-icon-152x152.png b/app/javascript/icons/apple-touch-icon-152x152.png
diff --git a/app/javascript/icons/apple-touch-icon-167x167.png b/app/javascript/icons/apple-touch-icon-167x167.png
diff --git a/app/javascript/icons/apple-touch-icon-180x180.png b/app/javascript/icons/apple-touch-icon-180x180.png
diff --git a/app/javascript/icons/apple-touch-icon-57x57.png b/app/javascript/icons/apple-touch-icon-57x57.png
diff --git a/app/javascript/icons/apple-touch-icon-60x60.png b/app/javascript/icons/apple-touch-icon-60x60.png
diff --git a/app/javascript/icons/apple-touch-icon-72x72.png b/app/javascript/icons/apple-touch-icon-72x72.png
diff --git a/app/javascript/icons/apple-touch-icon-76x76.png b/app/javascript/icons/apple-touch-icon-76x76.png
diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png
diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png
diff --git a/app/javascript/icons/favicon-48x48.png b/app/javascript/icons/favicon-48x48.png
diff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png
diff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png
diff --git a/app/javascript/images/merveilles-icon.svg b/app/javascript/images/merveilles-icon.svg
diff --git a/app/javascript/images/merveilles-logo-symbol-icon.svg b/app/javascript/images/merveilles-logo-symbol-icon.svg
diff --git a/app/javascript/images/merveilles-logo-symbol-wordmark.svg b/app/javascript/images/merveilles-logo-symbol-wordmark.svg
diff --git a/app/javascript/images/merveilles-logo.svg b/app/javascript/images/merveilles-logo.svg