Brandon Mathis c0a18589b2 Merge branch '2.1' into site ... Conflicts: _config.yml		2012-06-16 17:19:06 -05:00
..
_includes	Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars	2012-06-16 17:17:33 -05:00
_layouts	Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars	2012-06-16 17:17:33 -05:00
archives	Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375	2012-05-20 22:23:18 -05:00
assets/jwplayer	Fix CRLF, closes #374	2012-01-14 23:17:59 +01:00
images	Updated Twitter bird to latest logo. Added generated sprites to gitignore. Other improvements to theming and sprites	2012-06-07 13:11:00 -05:00
javascripts	fixed bug with Modernizr classes not being added when a feature is not supported	2012-06-11 00:26:10 -05:00
404.markdown	Fix a weird character in the 404 page.	2012-05-22 10:56:15 +08:00
atom.xml	added support for excerpting feed articles, added linklog support to category feed, refactored feeds to reduce duplication	2012-02-18 22:45:40 -06:00
index.html	Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars	2012-06-16 17:17:33 -05:00
octopress-favicon.png	Better method for customizing the favicon. Closes #594	2012-06-07 14:27:25 -05:00