tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
This commit is contained in:
Claire
2023-01-05 14:16:25 +01:00
parent 7e9d5bdbb9 18d00055f4
commit 6c20dad201
47 changed files with 357 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/assets/wordmark.dark.css
View File

@@ -1 +1 @@
// Not needed
/* Not needed */