mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 04:13:01 +00:00
6ee3e382df
Conflicts: - `app/javascript/packs/public.jsx`: Some of the removed dead code was split from this code in `app/javascript/core/public.js` and `app/javascript/core/settings.js`. Removed this dead code, and removed `app/javascript/core/public.js` altogether. |
||
---|---|---|
.. | ||
admin.jsx | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.jsx | ||
share.jsx | ||
sign_up.js |