Rebase to current 4.3.0-alpha-glitch-soc, update theming files

This commit is contained in:
Tarrien committed 2024-02-16 10:14:20 -05:00
1 parent aeb49bcba0
commit fff7926498
71 files changed
+30937 -2221

No files matched your search

+11
View File
@@ -0,0 +1,11 @@
# frozen_string_literal: true
Chewy.strategy(:mastodon) do
<<<<<<< HEAD
Dir[Rails.root.join('db', 'seeds', '*.rb')].each do |seed|
=======
Dir[Rails.root.join('db', 'seeds', '*.rb')].sort.each do |seed|
>>>>>>> af6eb37c7 (Wrap db:setup with Chewy.strategy(:mastodon) (#24302))
load seed
end
end