Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.

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

..

migrate

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

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

post_migrate

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

2019-09-30 12:23:57 +02:00

schema.rb

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

seeds.rb

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00