Merge branch 'hotfix/1.1.17' v1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:26:55 +0000 (16:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:26:55 +0000 (16:26 -0400)
commitf5122dd5d33d16606588e6f8eaaead60d9feae6e
tree84a1a8c8ce9737d2df7c70d3c956101778f25d4d
parent60bb2a91a64955cd8108ae536e10e74871185343
parentd50d9b0a6200487dd59ebd920982828cead98a50
Merge branch 'hotfix/1.1.17'