Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller_spec.rb | ||
| oembed_controller_spec.rb | ||
Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller_spec.rb | ||
| oembed_controller_spec.rb | ||