Merge branch 'master' of cvs2:WP-Themes/CCEOEM
authorLaury GvR <laury@gaslightmedia.com>
Mon, 29 Dec 2014 17:01:53 +0000 (12:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 29 Dec 2014 17:01:53 +0000 (12:01 -0500)
commitc4f4d50eb825efd411ad4c8bc883fc8f8eb315ee
treee8c5e5c9bbe8908a973f8ab5affba1217510d71c
parentfdeef92c0a300df4202328cf2865dba3cc4d23b7
parent16404d94cd865a6fa6a6a67eb7b21346eb98defb
Merge branch 'master' of cvs2:WP-Themes/CCEOEM

Conflicts:
css/app.css
scss/_structure.scss
css/app.css
header.php
scss/_structure.scss