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 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		6 years ago
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
post_migrate	…
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
seeds.rb	Admission-based registrations mode (#10250)	6 years ago