Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.

2020-06-30 23:00:20 +02:00

..

exports

…

migration

Fix account redirect confirmation message talking about moved followers (#13950)

2020-06-03 20:18:19 +02:00

preferences

…

two_factor_authentication

…

aliases_controller.rb

…

applications_controller.rb

…

base_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-04 23:04:42 +01:00

deletes_controller.rb

…

exports_controller.rb

…

featured_tags_controller.rb

…

flavours_controller.rb

…

identity_proofs_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-05-10 16:19:56 +02:00

imports_controller.rb

Fix ImportsController param to permit :mode (#13347)

2020-03-31 12:43:42 +02:00

migrations_controller.rb

…

pictures_controller.rb

Add customizable thumbnails for audio and video attachments (#14145)

2020-06-29 13:56:55 +02:00

preferences_controller.rb

…

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentications_controller.rb

…