Merge branch 'feature/Galleries' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Feb 2015 19:35:35 +0000 (14:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Feb 2015 19:35:35 +0000 (14:35 -0500)
commitc6e15f1ad4853c94f1d67f4e8fcf65cfefc1f797
tree3c3766b30149b150abeb40101fa18d492bfabb17
parentf3b57557ccfb9fbc41126634e24cdfb2d86eab8d
parent4f40001d108ec125c989a031d017cb44fed25041
Merge branch 'feature/Galleries' into develop

Conflicts:
css/app.css
scss/_settings.scss
scss/_structure.scss
templates/template.html
css/app.css
scss/_settings.scss
scss/_structure.scss
templates/template.html