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/components/admin | |
| 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/components/admin')
| -rw-r--r-- | app/javascript/flavours/glitch/components/admin/Counter.jsx (renamed from app/javascript/flavours/glitch/components/admin/Counter.js) | 0 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/components/admin/Dimension.jsx (renamed from app/javascript/flavours/glitch/components/admin/Dimension.js) | 0 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx (renamed from app/javascript/flavours/glitch/components/admin/ReportReasonSelector.js) | 0 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/components/admin/Retention.jsx (renamed from app/javascript/flavours/glitch/components/admin/Retention.js) | 0 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/components/admin/Trends.jsx (renamed from app/javascript/flavours/glitch/components/admin/Trends.js) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/components/admin/Counter.js b/app/javascript/flavours/glitch/components/admin/Counter.jsx index 5b6a19f8d..5b6a19f8d 100644 --- a/app/javascript/flavours/glitch/components/admin/Counter.js +++ b/app/javascript/flavours/glitch/components/admin/Counter.jsx diff --git a/app/javascript/flavours/glitch/components/admin/Dimension.js b/app/javascript/flavours/glitch/components/admin/Dimension.jsx index 3dac8c6c2..3dac8c6c2 100644 --- a/app/javascript/flavours/glitch/components/admin/Dimension.js +++ b/app/javascript/flavours/glitch/components/admin/Dimension.jsx diff --git a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.js b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx index 771dbb452..771dbb452 100644 --- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.js +++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx diff --git a/app/javascript/flavours/glitch/components/admin/Retention.js b/app/javascript/flavours/glitch/components/admin/Retention.jsx index e1ba3f6c9..e1ba3f6c9 100644 --- a/app/javascript/flavours/glitch/components/admin/Retention.js +++ b/app/javascript/flavours/glitch/components/admin/Retention.jsx diff --git a/app/javascript/flavours/glitch/components/admin/Trends.js b/app/javascript/flavours/glitch/components/admin/Trends.jsx index 774bf36e6..774bf36e6 100644 --- a/app/javascript/flavours/glitch/components/admin/Trends.js +++ b/app/javascript/flavours/glitch/components/admin/Trends.jsx |