mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 22:26:54 +00:00
6c99479ef4
Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well. |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
locales-glitch | ||
routes | ||
webpack | ||
application.rb | ||
boot.rb | ||
brakeman.ignore | ||
database.yml | ||
deploy.rb | ||
environment.rb | ||
formatjs-formatter.js | ||
i18n-tasks.yml | ||
navigation.rb | ||
pghero.yml | ||
puma.rb | ||
roles.yml | ||
routes.rb | ||
secrets.yml | ||
settings.yml | ||
sidekiq.yml | ||
storage.yml | ||
webpacker.yml |