mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 19:57:34 +02:00
83774367d2
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.js |