mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 14:46:46 +00:00
e4f8679eae
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper_spec.rb | ||
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 | ||
statuses_helper_spec.rb |