mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-26 23:03:41 +01:00
4aa6aba6ee
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. |
||
|---|---|---|
| .. | ||
| rules | ||
| configuration.js | ||
| development.js | ||
| generateLocalePacks.js | ||
| production.js | ||
| shared.js | ||
| test.js | ||
| translationRunner.js | ||