Chris Eppstein bba8e3f51b Merge branch 'stable' ... Conflicts: VERSION.yml doc-src/Gemfile.lock doc-src/content/CHANGELOG.markdown		2012-03-18 00:14:06 -07:00
..
partials	Merge branch 'stable'	2012-03-18 00:14:06 -07:00
article.haml	fixed merge	2011-04-26 18:34:51 -05:00
basic.haml	A basic blog for the compass website.	2011-04-17 01:49:19 -07:00
blog.haml	Add comments to blog posts	2011-04-24 23:29:29 -07:00
blueprint.haml	Smarter sidebar logic	2010-12-18 16:25:49 -08:00
core.haml	Smarter sidebar logic	2010-12-18 16:25:49 -08:00
default.haml	improved syntax highlighting	2010-12-15 18:15:19 -06:00
example.haml	fixed merge	2011-04-26 18:34:51 -05:00
homepage.haml	invalidations	2012-03-17 15:51:13 -07:00
main.haml	A basic blog for the compass website.	2011-04-17 01:49:19 -07:00
post.haml	Keep a list of blog authors in a yaml file.	2011-04-19 20:00:15 -07:00
redirect.haml	added redirect for reference and updated general layouts redirect	2011-01-07 17:45:30 -06:00
reference.haml	Document selectors in compass modules. This is mostly for upcoming placeholder selectors.	2012-03-13 09:21:05 -07:00
simple_core.haml	Fix bad filename	2010-11-21 15:59:37 -08:00
site.haml	improved syntax highlighting	2010-12-15 18:15:19 -06:00
tutorial.haml	updated docs design and added a layout for site pages	2010-12-07 17:28:52 -06:00