Merge branch 'hotfix/1.1.26'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:06:39 +0000 (17:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:06:39 +0000 (17:06 -0400)
commitd38226745f0aa33a422e4d413b04549ec87ad90b
tree3fbdc65f5daffe99ddce30a53868fec7bc4d093a
parent0d1667bbc296eeac84abbd1f0d7d5983c1e73059
parentac0918006b73d0a0e776cc38de3f6dcdbb56a798
Merge branch 'hotfix/1.1.26'