Merge tag 'V1.0.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 19:21:09 +0000 (15:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 19:21:09 +0000 (15:21 -0400)
commit959502fd855530c46e643848e5e105e13d6b771a
treeeec8d73e903f401c0ea31bb27262cc6e68768bd1
parentda8d8c8fffdfdd0f6468b69b8b4332d538883356
parentccdb2f7afd360adeed66c447fcb38a147d05fc29
Merge tag 'V1.0.0' into develop

v1.0.0

Conflicts:
header.php
header.php