Merge branch 'hotfix/1.2.10' v1.2.10
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:23 +0000 (13:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:23 +0000 (13:00 -0500)
commit18f0ffe58046217f1665a41cca18ead741a761b4
tree8a28f46b97a9a2501308cc9e20d81d3384066d56
parent43ae4e4ec6b362460e1a80ea4d8d0aa8ccfd1c35
parent4fff9cb7b153f471e03f5185bc964538101fbc43
Merge branch 'hotfix/1.2.10'