mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'
This commit is contained in:
commit
4e00cc2777
3 changed files with 5 additions and 1 deletions
|
@ -38,6 +38,8 @@ including the line number and the offending character.
|
||||||
as apparently happens sometimes in TextMate
|
as apparently happens sometimes in TextMate
|
||||||
(thanks to [Karl Varga](http://github.com/kjvarga).
|
(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)
|
## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
|
||||||
|
|
||||||
* Got rid of trailing whitespace produced when opening a conditional comment
|
* Got rid of trailing whitespace produced when opening a conditional comment
|
||||||
|
|
|
@ -40,6 +40,8 @@ Several bug fixes and minor improvements have been made, including:
|
||||||
as apparently happens sometimes in TextMate
|
as apparently happens sometimes in TextMate
|
||||||
(thanks to [Karl Varga](http://github.com/kjvarga).
|
(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)
|
## [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.
|
There were no changes made to Sass between versions 2.2.4 and 2.2.5.
|
||||||
|
|
|
@ -73,7 +73,7 @@ module Haml
|
||||||
end
|
end
|
||||||
|
|
||||||
opts.on_tail("-v", "--version", "Print version") do
|
opts.on_tail("-v", "--version", "Print version") do
|
||||||
puts("Haml #{::Haml.version[:string]}")
|
puts("Haml/Sass #{::Haml.version[:string]}")
|
||||||
exit
|
exit
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue