jekyll/lib
Parker Moore 10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
..
jekyll Merge branch 'nitoyon-slugify-new-param' 2015-01-17 16:06:10 -08:00
site_template Fix weird spacing 2015-01-15 22:04:00 +01:00
jekyll.rb Use External instead of Deprecator for requiring gracefully 2014-12-28 14:37:49 -05:00