summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2018-03-20 17:30:02 +0100
committerFlorian Pritz <bluewind@xinu.at>2018-03-20 17:30:02 +0100
commit006cf0764295d37daa597f4ea9cf31abb75d1b68 (patch)
tree4f40341fef42c760330e2caa501881ab195a67b2 /.travis.yml
parent61e2a033717a4669117696d0b6913474e3f57954 (diff)
parent02a0518e1c56ba3506f370362ac5ebdb8a138312 (diff)
Merge tag 'ci-upstream/3.1.7' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 43cfb824e..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-branches:
- except:
- - 2.1-stable
- - 2.2-stable
- - master \ No newline at end of file