mirror of https://github.com/Siphonay/mastodon
29124990a2
Conflicts: - `app/helpers/application_helper.rb`: Upstream reworked how CSS classes for the document's body are computed. Slight conflict due to glitch-soc's different theming system. Updated as upstream did. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
v2_alpha | ||
web | ||
oembed_spec.rb |