Merge branch 'feature/frontpage' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:45:08 +0000 (09:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:45:08 +0000 (09:45 -0400)
commitde4cbf62ae39ca5f9cb8a9efa285242a1011d211
treedf6dc4684f373e645787ccd425af5c7bc33517fc
parenta7aa3cdfbc49b9c402478315330b1125f952e71d
parent9b1fdad3362f5708919382ed09d6c1468358db47
Merge branch 'feature/frontpage' into develop

Conflicts:
css/front.css
css/front.css