mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 06:38:39 +09:00
7b09f585fa
Conflicts: - `app/javascript/packs/public.jsx`: Upstream refactored slightly (but touching almost all the lines in the code), glitch-soc had moved a few of the code to another file. Refactored as upstream did. |
||
---|---|---|
.. | ||
admin.jsx | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.jsx | ||
share.jsx | ||
sign_up.js |