aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis von Glasow <ashgenesis@gmail.com>2018-03-06 13:29:42 +0100
committerAlexis von Glasow <ashgenesis@gmail.com>2018-03-06 13:29:42 +0100
commit56fd2cbdc9280def5021b32558984aca006cb39e (patch)
tree6a794a73f96639becbefcfbb5421564c7766aa52
parent373bc8000871819a94fa2386efeff7039b15331f (diff)
downloadMail-master.zip
Mail-master.tar.gz
Mail-master.tar.bz2
chore(Bors) Configuring Bors-ngHEADmaster
Address hoaproject/Central#81.
-rw-r--r--.travis.yml6
-rw-r--r--bors.toml4
2 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 2edc4a4..d9b6c61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
language: php
+branches:
+ only:
+ - staging
+ - trying
+ - master
+
matrix:
include:
- php: 5.5
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..8f7747d
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,4 @@
+status = [
+ "continuous-integration/travis-ci/push"
+]
+timeout_sec = 1800