Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'stable' of git://github.com/nex3/haml into stable

Conflicts:
	doc-src/HAML_CHANGELOG.md
  • Loading branch information...
commit 812e728ea4dbb703b5a339ae02386a1207524676 2 parents e1a9fd6 + dd250ff
@nex3 nex3 authored
View
2  doc-src/HAML_CHANGELOG.md
@@ -12,6 +12,8 @@
as apparently happens sometimes in TextMate
(thanks to [Karl Varga](http://github.com/kjvarga).
+* Add "Sass" to the `--version` string for the executables.
+
* Raise an exception when commas are omitted in static attributes
(e.g. `%p{:foo => "bar" :baz => "bang"}`).
View
2  doc-src/SASS_CHANGELOG.md
@@ -9,6 +9,8 @@
as apparently happens sometimes in TextMate
(thanks to [Karl Varga](http://github.com/kjvarga).
+* Add "Sass" to the `--version` string for the executables.
+
## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
There were no changes made to Sass between versions 2.2.4 and 2.2.5.
View
2  lib/haml/exec.rb
@@ -73,7 +73,7 @@ def set_opts(opts)
end
opts.on_tail("-v", "--version", "Print version") do
- puts("Haml #{::Haml.version[:string]}")
+ puts("Haml/Sass #{::Haml.version[:string]}")
exit
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.