Merge branch 'master' into develop

lunny · web-flow · commit 674fdf9430c5 · 2017-04-05T19:56:15.000-07:00
diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,7 @@
 dependencies:
   override:
     # './...' is a relative pattern which means all subdirectories
+    - cd xorm
     - go get -t -d -v ./...
     - go build -v
 
