Permalink
Commits on Feb 18, 2010
  1. [Emacs] Use the font-lock rules from Emacs 23's bundled js.el for jav…

    …ascript filter blocks if available
    committed Feb 18, 2010
Commits on Feb 16, 2010
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Feb 16, 2010
  2. Bump VERSION to 2.2.20.

    nex3 committed Feb 16, 2010
  3. Merge branch 'stable'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/plugin/rails.rb
    nex3 committed Feb 16, 2010
  4. [Haml] Fix a bug with haml_tag and Rails XSS.

    Closes gh-92
    nex3 committed Feb 16, 2010
Commits on Feb 15, 2010
Commits on Feb 14, 2010
Commits on Feb 9, 2010
  1. Merge branch 'stable'

    nex3 committed Feb 9, 2010
  2. Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Feb 9, 2010
  3. Merge branch 'stable'

    nex3 committed Feb 9, 2010
Commits on Feb 7, 2010
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Feb 7, 2010
  2. Bump VERSION to 2.2.19.

    nex3 committed Feb 7, 2010
  3. [Sass] Update FSSM once again.

    nex3 committed Feb 7, 2010
Commits on Feb 6, 2010
  1. [Sass] Update vendor/fssm again.

    nex3 committed Feb 6, 2010
  2. [Sass] Update FSSM.

    nex3 committed Feb 6, 2010
Commits on Feb 5, 2010
  1. Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Feb 5, 2010
  2. Merge branch 'stable'

    nex3 committed Feb 5, 2010
  3. Merge branch 'stable'

    Conflicts:
    	VERSION
    nex3 committed Feb 5, 2010