Merge tag 'v1.2.12' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:16:55 +0000 (16:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:16:55 +0000 (16:16 -0400)
commitb2c3fc76e814cda452365fedc78218e130f10c94
tree8fa9d399117375da6bda2a4c01555295d9214560
parentff37999cb7ed36f5140c6033202dcce59d318180
parentdebf5edcaa57ac2a276ecc12935f1f5cc094af87
Merge tag 'v1.2.12' into develop

bumping style sheets