mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 14:43:42 +01:00
16d5217502
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json |
||
---|---|---|
.. | ||
_account_details.html.haml | ||
_report.html.haml | ||
index.html.haml | ||
show.html.haml |