Merge tag 'v1.0.13' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:47:47 +0000 (12:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:47:47 +0000 (12:47 -0500)
commitba5921c5980323a5dcbea1e65f812b9c86258bcd
tree4860d630402705ea33c730d8a33a0a806c193d44
parent212bc191332c2186bb7de804094493d50b3defb2
parent759c3d4a95ed665a9e6d22d9e81b8215ab1c6b8d
Merge tag 'v1.0.13' into develop

v1.0.13

Conflicts:
css/app.css
css/app.css