Merge branch 'hotfix/1.1.7' V1.1.7
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:01 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:01 +0000 (09:10 -0500)
commitc7150f1b0af3a1970c384a0f505e1f3fdab84e1f
tree50f0135abda00df9c538c4cfbcc31ccbcd1637f8
parent6f7cc7404e849f8cbb66f2d2153c8d9c45be4910
parent0cbcab83900bf779b7498d815b4e042b5cff8f72
Merge branch 'hotfix/1.1.7'