forked from mirrors/catstodon
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
077183a121
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change. |
2 years ago | |
---|---|---|
.. | ||
rules | 4 years ago | |
configuration.js | 2 years ago | |
development.js | 4 years ago | |
generateLocalePacks.js | 7 years ago | |
production.js | 2 years ago | |
shared.js | 2 years ago | |
tests.js | 3 years ago | |
translationRunner.js | 5 years ago |