Merge branch 'hotfix/1.1.17' v1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:43 +0000 (11:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:43 +0000 (11:29 -0400)
commit0838f8c0d3e07c8acbfb28f1853d1e0bdafa5ee6
treea088bb7cd870e7d6fb28042e0eff5d1dcb7f6e28
parentc751390d25717b8f624f94e1146795ba6922e988
parent9751744d3c0373dcb2ae33e963c5e012bd8473a0
Merge branch 'hotfix/1.1.17'