mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-27 00:53:11 +00:00
85558a5e18
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes. |
||
---|---|---|
.. | ||
index.js |