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
..
exports	Export and import show_reblogs together with following list (#10495)	6 years ago
two_factor_authentication	Lint pass (#8876)	6 years ago
applications_controller_spec.rb	lint pass 2 (#8878)	6 years ago
deletes_controller_spec.rb	…
exports_controller_spec.rb	Add spec for Settings::ExportsController#create (#9512)	6 years ago
flavours_controller_spec.rb	…
identity_proofs_controller_spec.rb	squashed identity proof updates (#10375)	6 years ago
imports_controller_spec.rb	…
migrations_controller_spec.rb	Lint pass (#8876)	6 years ago
notifications_controller_spec.rb	…
preferences_controller_spec.rb	Change language opt-out to language opt-in (#7823)	7 years ago
profiles_controller_spec.rb	Error message for avatar image that's too large. #9204 (#9518)	6 years ago
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	7 years ago
two_factor_authentications_controller_spec.rb	…