Parker Moore 279f1516d2 Merge branch 'master' into themes-asset-folder ... * master: Update history to reflect merge of #5381 [ci skip] Update history to reflect merge of #5383 [ci skip] run features on windows Appease Rubocop Update history to reflect merge of #5372 [ci skip] Add missing period to sentence in first paragraph.		2016-09-20 13:13:01 -07:00
..
jekyll	Merge branch 'master' into themes-asset-folder	2016-09-20 13:13:01 -07:00
site_template	Exclude Gemfile in _config.yml template	2016-08-25 14:54:59 +08:00
theme_template	add future gems to gitignore	2016-09-05 15:14:59 +05:30
jekyll.rb	Add ThemeAssetsReader which reads assets from a theme	2016-09-16 14:41:36 -07:00