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

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.

2020-06-24 15:33:41 +02:00

..

components

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

2020-06-24 15:33:41 +02:00

containers

Fix WebUI allowing to upload more items than the limit (#12300)

2019-11-07 09:07:03 +02:00

util

Misc. typos (#8694)

2018-09-14 00:53:09 +02:00

index.js

Add confirmation modal when logging out from the web app (#11671)

2019-08-26 18:24:10 +02:00