You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
account_batch.rb	Add batch actions for approving and rejecting pending accounts (#10469)	6 years ago
admin_settings.rb	…
delete_confirmation.rb	…
migration.rb	…
status_batch.rb	…
two_factor_confirmation.rb	…