projects / GitHub / WoltLab / com.woltlab.wcf.legalNotice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbce8c8 bc70090)
Merge branch '5.4'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Mar 2022 14:31:35 +0000 (15:31 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Mar 2022 14:31:35 +0000 (15:31 +0100)
1  2 
.github/workflows/codestyle.yml patch | diff1 | diff2 | blob | history
.github/workflows/javascript.yml patch | diff1 | diff2 | blob | history

diff --cc .github/workflows/codestyle.yml
Simple merge
diff --cc .github/workflows/javascript.yml
index ccd0d328f22ee61f01b5cbd4481404f48d57311f,7d4ac7cedc205760c07d3cddf23b5e7e70abe4ec..4f7f35ff6a92e29de92f1bbf960a6982e8dd29df
--- 1/.github/workflows/javascript.yml
--- 2/.github/workflows/javascript.yml
+++ b/.github/workflows/javascript.yml
@@@ -19,8 -19,8 +19,8 @@@ jobs
      - name: Set up node.js
        uses: actions/setup-node@v2
        with:
 -        node-version: "12"
 +        node-version: "14"
-     - uses: actions/checkout@v2
+     - uses: actions/checkout@v3
      - run: echo "::add-matcher::.github/javascript-syntax.json"
      - name: Remove files to be ignored
        run: |
Legal Notice System