Merge tag 'v1.0.9' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:15:55 +0000 (16:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:15:55 +0000 (16:15 -0400)
commite1c3204080a9fa2d2bfaa6a22ea03210fadbcf45
treefb4758d3c36efaff1c895bb8c61246ea3925a9e1
parent1dc6bf67fe830fdb1efa513f8af31a98915faba7
parent5525506257a54f764d11d27fb089c1cfc613eeb4
Merge tag 'v1.0.9' into develop

v1.0.9

Conflicts:
templates/template.html