Skip to content
Browse files

Sync with upstream

Conflicts:
	README.md
  • Loading branch information...
2 parents 41b0dd2 + 3a16e2b commit ec2b5ec78c8c0dac96ca648635d5833ecc435a8a @michaelklishin committed Feb 2, 2014
Showing with 5 additions and 1 deletion.
  1. +5 −1 README.md
View
6 README.md
@@ -44,6 +44,10 @@ None.
## Copyright & License
-Michael S. Klishin, Travis CI Development Team, 2012-14.
+Michael S. Klishin, Travis CI Development Team, 2012-2014.
Released under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html).
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/michaelklishin/haskell-platform-chef-cookbook/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

0 comments on commit ec2b5ec

Please sign in to comment.
Something went wrong with that request. Please try again.