Merge branch '2.1'

2015-10-20 10:15:10 +02:00 · 2015-10-20 10:15:10 +02:00 · 36887da5c2
commit 36887da5c2
parent 9885fd9c4b 845d1f8008
3 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -26,12 +26,12 @@ matrix:
      - php: 5.6
        env: TASKWARRIOR=2.4.3
      - php: 5.6
-        env: TASKWARRIOR=2.5.0.beta2
+        env: TASKWARRIOR=2.5.0.beta3
  allow_failures:
      - php: 7
      - php: hhvm
      - php: 5.6
-        env: TASKWARRIOR=2.5.0.beta2
+        env: TASKWARRIOR=2.5.0.beta3

 before_install:
  - composer self-update
--- a/build/taskwarrior-2.5.0.beta2
+++ b/build/taskwarrior-2.5.0.beta2
--- a/build/taskwarrior-2.5.0.beta3
+++ b/build/taskwarrior-2.5.0.beta3