mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-11 16:05:04 +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 |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
api | ||
auth | ||
concerns | ||
oauth | ||
settings | ||
well_known | ||
about_controller_spec.rb | ||
account_follow_controller_spec.rb | ||
account_unfollow_controller_spec.rb | ||
accounts_controller_spec.rb | ||
application_controller_spec.rb | ||
authorize_interactions_controller_spec.rb | ||
emojis_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
home_controller_spec.rb | ||
intents_controller_spec.rb | ||
invites_controller_spec.rb | ||
manifests_controller_spec.rb | ||
media_controller_spec.rb | ||
remote_follow_controller_spec.rb | ||
remote_unfollows_controller_spec.rb | ||
shares_controller_spec.rb | ||
statuses_controller_spec.rb | ||
stream_entries_controller_spec.rb | ||
tags_controller_spec.rb |