mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 21:03:27 +00:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
mailer_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
stream_entries_helper.rb |