mastodon/app/models/form
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
admin_settings.rb Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
delete_confirmation.rb Account deletion (#3728) 2017-06-14 18:01:27 +02:00
migration.rb Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00
status_batch.rb Remove Form::StatusBatch::ACTION_TYPE unused (#9623) 2018-12-25 18:29:51 +01:00
two_factor_confirmation.rb