Merge branch 'master' into develop

Conflicts: .travis.yml
wizjin · Feb 3, 2014 · 40b4ff8 · 40b4ff8
2 parents 9140ad8 + 6b74ae6
commit 40b4ff8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,11 @@
 language: go
 
 go:
-  - 0.4
+  - 1.0
+  - 1.1
   - tip
+
+# whitelist
+branches:
+  only:
+    - master
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 
 这是一个使用Go语言对微信公众平台的封装。参考了微信公众平台API文档
 
+[![Build Status](https://travis-ci.org/wizjin/weixin.png?branch=master)](https://travis-ci.org/wizjin/weixin)
 [![GoDoc](http://godoc.org/github.com/wizjin/weixin?status.png)](http://godoc.org/github.com/wizjin/weixin)
 
 ## 入门