mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-28 03:41:37 +01:00
b2526316f5
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper.rb | ||
application_helper.rb | ||
domain_control_helper.rb | ||
email_helper.rb | ||
flashes_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 |