mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 06:58:06 +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 |
||
---|---|---|
.. | ||
_administration.html.haml | ||
_contact.html.haml | ||
_features.html.haml | ||
_forms.html.haml | ||
_links.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |