mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
1a664560cc
Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes. |
||
---|---|---|
.. | ||
admin.jsx | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.jsx | ||
share.jsx |