Merge branch 'stable'

Conflicts: VERSION
jay3126 · Apr 25, 2011 · 5f04bbd · 5f04bbd
2 parents 09aaca8 + abfd8d1
commit 5f04bbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/doc-src/HAML_CHANGELOG.md b/doc-src/HAML_CHANGELOG.md
@@ -3,6 +3,10 @@
 * Table of contents
 {:toc}
 
+## 3.1.1
+
+* Update the vendored Sass to version 3.1.0.
+
 ## 3.1.0
 
 * Don't add a `type` attribute to `<script>` and `<style>` tags generated by filters

diff --git a/vendor/sass b/vendor/sass