Solved merge conflicts

2020-09-21 10:09:21 +02:00
parent 2eab159423 f315ad20e6
commit 8e73d3b5bf
116 changed files with 3509 additions and 1149 deletions
@@ -3,6 +3,8 @@ name: E2E Test Linux
 on:
  pull_request:
    paths-ignore:
+      - 'contrib/**'
+      - 'docs/**'
      - 'microsite/**'

 jobs: