diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-09-11 18:44:14 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-09-11 18:44:14 +0200 |
| commit | 2af0f5e64e47c59e575802249983feb8968959b1 (patch) | |
| tree | a2d80749d6b297ef05b1893949081b678f9e8677 /.github | |
| parent | chore(Merge): remote-tracking branch 'origin/master' (diff) | |
| parent | Translated using Weblate (Arabic) (diff) | |
| download | libredirect-2af0f5e64e47c59e575802249983feb8968959b1.zip | |
chore(merge): Merge remote-tracking branch 'origin/master'
Following Conflicts have been resolved:
README.md
src/_locales/bs/messages.json
src/_locales/de/messages.json
src/_locales/en/messages.json
src/_locales/fr/messages.json
src/_locales/ko/messages.json
src/_locales/nb_NO/messages.json
src/_locales/pt/messages.json
src/_locales/pt_BR/messages.json
src/_locales/sr/messages.json
src/_locales/vi/messages.json
src/assets/images/libredirect.svg
src/assets/javascripts/services.js
src/config.json
src/manifest.json
src/updates/updates.xml
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/test.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f31a693f..612e46a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,5 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 - with: - node-version: "16" - run: npm install - run: npm test |