Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make includes dir configurable and rename dirs for consistency #3782

Merged
merged 2 commits into from
Aug 16, 2015
Merged

Make includes dir configurable and rename dirs for consistency #3782

merged 2 commits into from
Aug 16, 2015

Commits on Aug 9, 2015

  1. Make _includes directory configurable; closes #2684 

    and rename `plugins`, `layouts` and `data_source` directories for consistency
    @fniephaus
    fniephaus committed Aug 9, 2015
    Configuration menu
    Copy the full SHA
    ac56e9d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/jekyll/jekyll into _includes 

    Conflicts:
	bin/jekyll
    @fniephaus
    fniephaus committed Aug 9, 2015
    Configuration menu
    Copy the full SHA
    2812341 View commit details
    Browse the repository at this point in the history