mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-11 16:05:04 +00:00
050efbc126
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
stream_entries_helper.rb |