Merge tag 'v1.0.27' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:54:20 +0000 (09:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:54:20 +0000 (09:54 -0400)
commit8879d9597706780dba7ba82cd3931331f702feb4
tree6ef33a407e29b4fda65eb00f38a378f73bae3bc3
parent6182b86579fced0f7bec75d5b96b98c936d439c3
parent9da7fe469f01eb23dfac77c13bb091d5f74393fd
Merge tag 'v1.0.27' into develop

v1.0.27

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