mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
dc2ab6e646
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places. |
||
---|---|---|
.. | ||
about.js | ||
common.js | ||
error.js | ||
home.js | ||
public.js | ||
settings.js | ||
share.js |