Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
aliases
applications
deletes
exports
featured_tags	Add explanation to featured hashtags page and profile (#11586)	2019-08-17 18:07:52 +02:00
flavours
identity_proofs	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
imports
migration/redirects
migrations
preferences
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
shared
two_factor_authentication
two_factor_authentications