Permalink
Commits on Oct 9, 2009
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Oct 9, 2009
  2. Bump the VERSION to 2.2.7.

    nex3 committed Oct 9, 2009
Commits on Oct 8, 2009
  1. Merge branch 'stable'

    nex3 committed Oct 8, 2009
Commits on Oct 7, 2009
Commits on Oct 6, 2009
Commits on Oct 5, 2009
  1. Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	test/haml/html2haml_test.rb
    nex3 committed Oct 5, 2009
  2. [Haml] [html2haml] Escape #{}.

    nex3 committed Oct 5, 2009
  3. Merge branch 'stable'

    nex3 committed Oct 5, 2009
  4. Fix a typo.

    nex3 committed Oct 5, 2009
  5. Merge branch 'stable'

    nex3 committed Oct 5, 2009
  6. Merge branch 'stable' of git@github.com:nex3/haml into stable

    Conflicts:
    	Rakefile
    nex3 committed Oct 5, 2009
  7. Raise an error when releasing to ELPA if the Sass requirement of Haml…

    … isn't up-to-date.
    nex3 committed Oct 5, 2009
Commits on Sep 28, 2009
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Sep 28, 2009
  2. Bump version to 2.2.6.

    nex3 committed Sep 28, 2009
  3. Merge branch 'stable'

    nex3 committed Sep 28, 2009
  4. Merge branch 'stable'

    nex3 committed Sep 28, 2009
  5. Merge branch 'stable' of git://github.com/nex3/haml into stable

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Sep 28, 2009