mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-30 21:29:03 +01:00
45fce0e496
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml |
||
---|---|---|
.. | ||
v1 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb | ||
push_controller_spec.rb | ||
salmon_controller_spec.rb | ||
subscriptions_controller_spec.rb |