Merge branch 'hotfix/1.2.13' v1.2.13
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Jul 2017 14:58:15 +0000 (10:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Jul 2017 14:58:15 +0000 (10:58 -0400)
commita74034cb3f559f667983852b4c44082ea1c6209f
tree79fe669371ab9ed54889cf3d99385f03c6a8f527
parentfa4cda479e2047f271faf513275d22a35988bed4
parent327e312016c0aa9a613f71ba60611274813f7aab
Merge branch 'hotfix/1.2.13'