Merge branch 'develop' of cvs2:WP-Themes/staffords into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Dec 2015 21:13:49 +0000 (16:13 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Dec 2015 21:13:49 +0000 (16:13 -0500)
1  2 
css/app.css
scss/_blog.scss

diff --cc css/app.css
Simple merge
diff --cc scss/_blog.scss
Simple merge