mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 19:10:22 -05:00
15929a3d59
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`. |
||
---|---|---|
.. | ||
_bio.html.haml | ||
_header.html.haml | ||
_moved.html.haml | ||
_og.html.haml | ||
show.html.haml | ||
show.rss.ruby |