Merge branch 'master' of github.com:sstephenson/sprockets

sstephenson · Apr 3, 2011 · 30697ea · 30697ea
2 parents bf9c859 + 734a935
commit 30697ea
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+<div style="border: 1px solid #c00; background: #fff; padding: 5px 10px"><strong>This is an in-progress rewrite of Sprockets</strong> to be released as version 2.0. Please see the <a href="https://github.com/sstephenson/sprockets/tree/1.0.x">1.0.x branch</a> for information on the current release.</div>
+
 Sprockets 2
 ===========