4cb367e6d4
Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
webpack | ||
application.rb | ||
boot.rb | ||
brakeman.ignore | ||
database.yml | ||
deploy.rb | ||
environment.rb | ||
i18n-tasks.yml | ||
navigation.rb | ||
puma.rb | ||
routes.rb | ||
secrets.yml | ||
settings.yml | ||
sidekiq.yml | ||
webpacker.yml |