mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper.rb | ||
application_helper.rb | ||
domain_control_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb |