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

+17
View File
@@ -0,0 +1,17 @@
#!/usr/bin/env ruby
APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot'
require_relative '../lib/mastodon/cli/main'
begin
Chewy.strategy(:mastodon) do
<<<<<<< HEAD
Mastodon::CLI::Main.start(ARGV)
=======
Mastodon::CLI.start(ARGV)
>>>>>>> 479b66637 (Fix sidekiq jobs not triggering Elasticsearch index updates (#24046))
end
rescue Interrupt
exit(130)
end