Merge branch 'master' into add_datadir

developit · Jun 20, 2020 · a06c48d · a06c48d
2 parents 6719862 + e14ac6a
commit a06c48d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

diff --git a/.travis.yml b/.travis.yml