mastodon/app/models/form
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
account_batch.rb Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
admin_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-01 21:28:31 +02:00
delete_confirmation.rb
migration.rb
status_batch.rb Remove Form::StatusBatch::ACTION_TYPE unused (#9623) 2018-12-25 18:29:51 +01:00
two_factor_confirmation.rb