Michael Rose 4ba7cccdc4 Merge branch 'susy-3-upgrade' ...

Conflicts:
	_sass/minimal-mistakes/_page.scss
	docs/_sass/minimal-mistakes/_page.scss

2017-08-03 16:27:21 -04:00

..

_data

Add missing Spanish UI text strings

2017-07-21 16:30:21 -04:00

_docs

Update CHANGELOG and history

2017-08-03 16:18:54 -04:00

_drafts

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00

_includes

Fix variable names

2017-07-05 15:45:17 -04:00

_layouts

Bump version to 4.4.2

2017-07-07 15:49:17 -04:00

_pages

Bump version to 4.4.2

2017-07-07 15:49:55 -04:00

_pets

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00

_portfolio

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00

_posts

Replace Gist Liquid tag with embed script

2017-07-07 15:33:19 -04:00

_recipes

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00

_sass

Merge branch 'susy-3-upgrade'

2017-08-03 16:27:21 -04:00

assets

Bump version to 4.4.2

2017-07-07 15:49:17 -04:00

_config.dev.yml

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00

_config.yml

Update Update CHANGELOG and history

2017-07-05 12:26:54 -04:00

Gemfile

Add tzinfo.data gem for Windows to appease timezone error

2017-07-07 15:36:19 -04:00

screenshot-layouts.png

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00

screenshot.png

Move gh-pages branch files into /docs and add test files

2016-11-03 11:52:04 -04:00