mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-18 16:10:57 +00:00
45fce0e496
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml |
||
---|---|---|
.. | ||
_features.html.haml | ||
_og.html.haml | ||
show.html.haml |