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

projects / WP-Themes / truenorthgolf.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 23743f4 ce43215)

author	Laury GvR <laury@gaslightmedia.com>
	Mon, 10 Jul 2017 15:52:49 +0000 (11:52 -0400)
committer	Laury GvR <laury@gaslightmedia.com>
	Mon, 10 Jul 2017 15:52:49 +0000 (11:52 -0400)
commit	abdabdc7df690f9e8e4ab140b7ceadaefbf6865d
tree	818351bbb022cbe8f4516f21ec8b69099e46c1c8	tree \| snapshot
parent	23743f4b6ca712a4aac856c01d518cf0d149a05a	commit \| diff
parent	ce43215eefb0d5e1339cee4eb4996072bbdb0b9f	commit \| diff

Merge branch 'master' into develop

20 files changed:

archive.php	diff1 \|	diff2 \|	blob \| history
css/app.css	diff1 \|	diff2 \|	blob \| history
footer.php	diff1 \|	diff2 \|	blob \| history
functions.php	diff1 \|	diff2 \|	blob \| history
header.php	diff1 \|	diff2 \|	blob \| history
home.php	diff1 \|	diff2 \|	blob \| history
js/app.js	diff1 \|	diff2 \|	blob \| history
js/app.min.js	diff1 \|	diff2 \|	blob \| history
page-narrow-template.php	diff1 \|	diff2 \|	blob \| history
page.php	diff1 \|	diff2 \|	blob \| history
parts/client-info-footer.php	diff1 \|	diff2 \|	blob \| history
parts/off-canvas-menu.php	diff1 \|	diff2 \|	blob \| history
parts/slide-show.php	diff1 \|	diff2 \|	blob \| history
scss/_blog.scss	diff1 \|	diff2 \|	blob \| history
scss/_main.scss	diff1 \|	diff2 \|	blob \| history
scss/_page.header.scss	diff1 \|	diff2 \|	blob \| history
scss/_sidebar.scss	diff1 \|	diff2 \|	blob \| history
scss/_topbar.scss	diff1 \|	diff2 \|	blob \| history
sidebar.php	diff1 \|	diff2 \|	blob \| history
style.css	diff1 \|	diff2 \|	blob \| history