Merge branch 'master' of github.com:barryclark/jekyll-now

Browse Source

Conflicts:
	README.md

...

This commit is contained in:

Barry Clark 2014-05-19 18:08:57 -04:00

parent 933eef449e 51380cda46

commit 74c851c6a8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available