mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 19:10:22 -05:00
eb39db7f93
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
direct_controller.rb | ||
home_controller.rb | ||
list_controller.rb | ||
public_controller.rb | ||
tag_controller.rb |