diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
| commit | aae60a2366d6dadbcc4a0197d4dd17afc931c8a0 (patch) | |
| tree | 0bbbc278809d9990365a2d79abeaf02891990d51 /app/javascript/flavours/glitch/features/blocks | |
| parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
| parent | bb9ca8a587ee5a3ec8778e72828aca0ba8871327 (diff) | |
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.
Diffstat (limited to 'app/javascript/flavours/glitch/features/blocks')
0 files changed, 0 insertions, 0 deletions