mirror of https://github.com/Siphonay/mastodon
1474318691
Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road. |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| core | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| packs | ||
| skins | ||
| styles | ||
| types | ||