mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-26 07:06:48 +00:00
93912f0498
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting. |
||
---|---|---|
.. | ||
admin | ||
accounts_helper.rb | ||
application_helper.rb | ||
branding_helper.rb | ||
context_helper.rb | ||
domain_control_helper.rb | ||
email_helper.rb | ||
flashes_helper.rb | ||
formatting_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
languages_helper.rb | ||
mascot_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb | ||
webfinger_helper.rb |