mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-13 02:12:52 +00:00
91bef4759f
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js |
||
---|---|---|
.. | ||
v2 | ||
account_serializer.rb | ||
application_serializer.rb | ||
context_serializer.rb | ||
credential_account_serializer.rb | ||
custom_emoji_serializer.rb | ||
filter_serializer.rb | ||
instance_serializer.rb | ||
list_serializer.rb | ||
media_attachment_serializer.rb | ||
mute_serializer.rb | ||
notification_serializer.rb | ||
preview_card_serializer.rb | ||
relationship_serializer.rb | ||
report_serializer.rb | ||
search_serializer.rb | ||
status_serializer.rb | ||
tag_serializer.rb | ||
web_push_subscription_serializer.rb |