mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 12:18:06 +01: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 |