18556d3e9b
Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones as upstream did. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| v2_alpha | ||
| web | ||
| base_controller.rb | ||
| oembed_controller.rb | ||