Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Aug 2016 20:44:05 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Aug 2016 20:44:05 +0000 (16:44 -0400)
commit111357ab306eace505bba8eadd46407c8a53c77d
tree4298617cf82f8e7cfc97803d533ab585798d0c90
parent494e5452059f6801fc48f8ddc58c02fcfc1845b3
parent73f3e8e2e9528078e89068455ba09d11c41ab614
Merge branch 'hotfix/1.1.11'