03846ad6c2
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 |