mirror of
https://github.com/mastodon/mastodon.git
synced 2025-02-07 09:48:20 +01:00
Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss
Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss