Anatol Broder 79f50b0568 Resolve conflict		2013-09-16 08:15:10 +02:00
..
jekyll	Resolve conflict	2013-09-16 08:15:10 +02:00
site_template	Update dummy email address to example.com domain	2013-08-10 15:29:33 +02:00
jekyll.rb	Update gemspec & version to v1.2.1	2013-09-14 20:59:06 -04:00