summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Sluijters <daenney@users.noreply.github.com>2015-04-22 19:20:26 +0200
committerDaniele Sluijters <daenney@users.noreply.github.com>2015-04-22 19:20:26 +0200
commitfdf57c39a425d041ca5040283be93eb6be44f638 (patch)
treea35a7503149c129b6fca6a4d75432aa6445fc730
parentaf27697750e1d901bf0ae28c10093429e401713c (diff)
parent47e8f8eb8b035c60ace62eb77e5e668bfc205377 (diff)
Merge branch 'master' into 1.0.x
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 23876ff..cd13788 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,5 @@ deploy:
secure: "PzzvPB326Yx0hheLbusZGYCGW4i1jOOMjwJMC/7QpbN4+gvMdmHpmQP3XeQ5tm+YYXqLPMyr1he1viTln8GPqLk1qpzF55H5mTakPxMjWZfRYvM+Q7lmtOEsBEXXSJk0ZYwMHXGVd8ouDrhaRzS2JqnhCAhLat0HeLcERWZx6Ok="
on:
tags: true
+ all_branches: true
rvm: 2.1