mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'
Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md
This commit is contained in:
commit
ec1e894f45
4 changed files with 8 additions and 4 deletions
|
@ -29,7 +29,7 @@ Haml and `html2haml` now produce more descriptive errors
|
|||
when given a template with invalid byte sequences for that template's encoding,
|
||||
including the line number and the offending character.
|
||||
|
||||
## 2.2.7 (Unreleased)
|
||||
## [2.2.7](http://github.com/nex3/haml/commit/2.2.7)
|
||||
|
||||
* Fixed an `html2haml` issue where ERB attribute values
|
||||
weren't HTML-unescaped before being transformed into Haml.
|
||||
|
|
|
@ -34,6 +34,10 @@ Several bug fixes and minor improvements have been made, including:
|
|||
* Displaying the expected strings as strings rather than regular expressions
|
||||
whenever possible.
|
||||
|
||||
## [2.2.7](http://github.com/nex3/haml/commit/2.2.7)
|
||||
|
||||
There were no changes made to Sass between versions 2.2.6 and 2.2.7.
|
||||
|
||||
## [2.2.6](http://github.com/nex3/haml/commit/2.2.6)
|
||||
|
||||
* Don't crash when the `__FILE__` constant of a Ruby file is a relative path,
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
;; Author: Nathan Weizenbaum
|
||||
;; URL: http://github.com/nex3/haml/tree/master
|
||||
;; Version: 2.2.6
|
||||
;; Version: 2.2.7
|
||||
;; Created: 2007-03-08
|
||||
;; By: Nathan Weizenbaum
|
||||
;; Keywords: markup, language, html
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
;; Author: Nathan Weizenbaum
|
||||
;; URL: http://github.com/nex3/haml/tree/master
|
||||
;; Version: 2.2.6
|
||||
;; Version: 2.2.7
|
||||
;; Created: 2007-03-15
|
||||
;; By: Nathan Weizenbaum
|
||||
;; Keywords: markup, language, css
|
||||
;; Package-Requires: ((haml-mode "2.2.5"))
|
||||
;; Package-Requires: ((haml-mode "2.2.7"))
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
|
|
Loading…
Reference in a new issue