diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-26 15:06:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-26 15:06:03 +0100 |
| commit | 6a4be4e96677eb3e1303ddcab8f8b4bea7298453 (patch) | |
| tree | 52627bf6dd64b0a33e280442b2de60b4e802a544 /app/javascript/flavours/glitch/features/blocks | |
| parent | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (diff) | |
| parent | b91756fd4d475edff890e460c44b3a7245ad51e2 (diff) | |
Merge pull request #2119 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/blocks')
| -rw-r--r-- | app/javascript/flavours/glitch/features/blocks/index.jsx (renamed from app/javascript/flavours/glitch/features/blocks/index.js) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/blocks/index.js b/app/javascript/flavours/glitch/features/blocks/index.jsx
index 4461bd14d..4461bd14d 100644
--- a/app/javascript/flavours/glitch/features/blocks/index.js
+++ b/app/javascript/flavours/glitch/features/blocks/index.jsx
|