cvs2.gaslightmedia.com Git - WP-Themes/ChippewaCounty.git/commit

projects / WP-Themes / ChippewaCounty.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b0c3d17 2360453)

author	Ian Weller <ian@gaslightmedia.com>
	Mon, 5 Oct 2015 14:02:37 +0000 (10:02 -0400)
committer	Ian Weller <ian@gaslightmedia.com>
	Mon, 5 Oct 2015 14:02:37 +0000 (10:02 -0400)
commit	a0a1859ff8ecafc5deb78dfa7045b95cd97400b0
tree	790fc21643d866c4fa640012eddbaa30753afd2e	tree \| snapshot
parent	b0c3d17b0631fbfc9ccba011c9c0cea69c1fcff9	commit \| diff
parent	2360453040cc3d9c0e4eec2758f83afa63ccf40b	commit \| diff

Merge branch 'develop' of cvs2:WP-Themes/ChippewaCounty into develop

13 files changed:

Gruntfile.js	diff1 \|	diff2 \|	blob \| history
css/app.css	diff1 \|	diff2 \|	blob \| history
footer.php	diff1 \|	diff2 \|	blob \| history
front-page.php	diff1 \|	diff2 \|	blob \| history
functions.php	diff1 \|	diff2 \|	blob \| history
header.php	diff1 \|	diff2 \|	blob \| history
index.html	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
js/app.js	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
page.php	diff1 \|	diff2 \|	blob \| history
scss/_settings.scss	diff1 \|	diff2 \|	blob \| history
scss/_structure.scss	diff1 \|	diff2 \|	blob \| history