Merge pull request #4051 from pixelfed/staging

Staging
2024-12-21 04:23:16 +00:00 · 2022-12-31 01:45:21 -07:00 · 2022-12-31 01:45:21 -07:00 · d84f3dc1d4
commit d84f3dc1d4
parent 9de3163af6 e99b41292a
21 changed files with 2 additions and 2 deletions
--- a/app/Util/Media/Filter.php
+++ b/app/Util/Media/Filter.php
@ -28,7 +28,7 @@ class Filter {
 		'Chill' => 'filter-lofi',
 		'Van' => 'filter-ludwig',
 		'Apache' => 'filter-maven',
-		'Mayflower' => 'filter-mayfair',
+		'May' => 'filter-mayfair',
 		'Ceres' => 'filter-moon',
 		'Knoxville' => 'filter-nashville',
 		'Felicity' => 'filter-perpetua',
--- a/public/js/app.js
+++ b/public/js/app.js
--- a/public/js/compose-123122-swxib.js
+++ b/public/js/compose-123122-swxib.js
--- a/public/js/daci-123122-swxib.js
+++ b/public/js/daci-123122-swxib.js
--- a/public/js/dffc-123122-swxib.js
+++ b/public/js/dffc-123122-swxib.js
--- a/public/js/discover-123122-swxib.js
+++ b/public/js/discover-123122-swxib.js
--- a/public/js/dms-123122-swxib.js
+++ b/public/js/dms-123122-swxib.js
--- a/public/js/dmsg-123122-swxib.js
+++ b/public/js/dmsg-123122-swxib.js
--- a/public/js/dmyh-123122-swxib.js
+++ b/public/js/dmyh-123122-swxib.js
--- a/public/js/dmym-123122-swxib.js
+++ b/public/js/dmym-123122-swxib.js
--- a/public/js/dsfc-123122-swxib.js
+++ b/public/js/dsfc-123122-swxib.js
--- a/public/js/dssc-123122-swxib.js
+++ b/public/js/dssc-123122-swxib.js
--- a/public/js/home-123122-swxib.js
+++ b/public/js/home-123122-swxib.js
--- a/public/js/manifest.js
+++ b/public/js/manifest.js
--- a/public/js/notifications-123122-swxib.js
+++ b/public/js/notifications-123122-swxib.js
--- a/public/js/notifications-12722-3lkw2.js
+++ b/public/js/notifications-12722-3lkw2.js
--- a/public/js/post-123122-swxib.js
+++ b/public/js/post-123122-swxib.js
--- a/public/js/profile-123122-swxib.js
+++ b/public/js/profile-123122-swxib.js
--- a/public/js/spa.js
+++ b/public/js/spa.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@ -172,7 +172,7 @@ window.App.util = {
 			['Chill','filter-lofi'],
 			['Van','filter-ludwig'],
 			['Apache','filter-maven'],
-			['Mayflower','filter-mayfair'],
+			['May','filter-mayfair'],
 			['Ceres','filter-moon'],
 			['Knoxville','filter-nashville'],
 			['Felicity','filter-perpetua'],