Merge pull request #94 from stan-dev/develop

jgabry · jgabry · commit f79313708370 · 2015-09-17T18:03:06.000-04:00
merge develop
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Travis-CI Build Status](https://travis-ci.org/stan-dev/shinystan.svg?branch=master)](https://travis-ci.org/stan-dev/shinystan)
+[![Travis-CI Build Status](https://travis-ci.org/stan-dev/shinystan.svg?branch=develop)](https://travis-ci.org/stan-dev/shinystan)
 [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/shinystan?color=blue)](http://cran.r-project.org/web/packages/shinystan)
 
 -------------------

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![Travis-CI Build Status](https://travis-ci.org/stan-dev/shinystan.svg?branch=master)](https://travis-ci.org/stan-dev/shinystan)`
	`1`	`+[![Travis-CI Build Status](https://travis-ci.org/stan-dev/shinystan.svg?branch=develop)](https://travis-ci.org/stan-dev/shinystan)`
`2`	`2`	`[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/shinystan?color=blue)](http://cran.r-project.org/web/packages/shinystan)`
`3`	`3`
`4`	`4`	`-------------------`