Merge branch 'hotfix/1.1.7' v1.1.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:47 +0000 (16:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:47 +0000 (16:56 -0400)
commitfee0357fb32065b1befef42a95f05defe4407eb1
tree657154163115e9271265edcf2b5d5dafdb5a2784
parent4ea8f845257c679ed4233dbe0a29ed15dbc0630b
parent13b101e8a2ec1131dc4326328adb42faaeb4b931
Merge branch 'hotfix/1.1.7'