Merge branch 'hotfix/1.1.4' V1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:18:29 +0000 (17:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:18:29 +0000 (17:18 -0500)
commitb2eec807bc73d63d4bf0a3c8d1e0f1f9ef60f180
tree59643ba962f6d164b7845bc7d4304eff6b448a01
parent64d3f1d56c2f13224b66f4cfb638d1e277fe5903
parent3f3b75470b94a645ebe3d7dccec9d4fca907e9d3
Merge branch 'hotfix/1.1.4'