mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 15:34:55 +00:00
e7f1bfdc2d
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper_spec.rb | ||
flashes_helper_spec.rb | ||
home_helper_spec.rb | ||
instance_helper_spec.rb | ||
jsonld_helper_spec.rb | ||
routing_helper_spec.rb | ||
settings_helper_spec.rb | ||
stream_entries_helper_spec.rb |