Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

confirmations_controller.rb

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

2019-01-02 15:36:53 +01:00

omniauth_callbacks_controller.rb

…

passwords_controller.rb

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

2018-08-01 00:18:13 +02:00

registrations_controller.rb

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

2019-05-04 16:37:26 +02:00

sessions_controller.rb

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

2018-10-30 17:52:08 +01:00