mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
1488be7d96
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json |
||
---|---|---|
.. | ||
applications | ||
deletes | ||
exports | ||
featured_tags | ||
flavours | ||
identity_proofs | ||
imports | ||
migrations | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentications |