aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-26 15:39:55 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-26 15:39:55 -0400
commitb346d43c9775c350b12d4ea5392d58b0cdaa933c (patch)
treecdc18c39ce7492c24f6356cd40d815adfe913dba
parent8374e3e1943166f25f5c96970a4b8ac6101dbfc1 (diff)
parentebb441ded25420bad941d970ef650552d6cc2f9c (diff)
downloadtor-b346d43c9775c350b12d4ea5392d58b0cdaa933c.tar.gz
tor-b346d43c9775c350b12d4ea5392d58b0cdaa933c.zip
Merge branch 'maint-0.2.4' into release-0.2.4
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index fa0337b492..59b32dbe42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ compiler:
notifications:
irc:
channels:
- - "irc.oftc.net#tor-bots"
+ - "irc.oftc.net#tor-ci"
template:
- "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}"
- "Build #%{build_number} %{result}. Details: %{build_url}"