395b9011ee
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| _custom_emoji.html.haml | ||
| index.html.haml | ||
| new.html.haml | ||