diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-05 20:43:48 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-05 20:46:56 +0100 |
| commit | 7623e181247b4d2227b7774143514f6e1ca9253b (patch) | |
| tree | b9a82790b7cb1f075769e7e5ca757b2ede322620 /app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx | |
| parent | bb4e211c86270de6de8a78da96295208ee77dce1 (diff) | |
| parent | dfa9843ac85d04e1facb2f757fd9288d8bb9fb2c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx')
0 files changed, 0 insertions, 0 deletions