Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:09 +0000 (12:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:09 +0000 (12:46 -0400)
commitfbed8bbda4c816728f5019676ec198b6bd0aa8da
tree9e69f92d640cc5f87d0714b2dc9dced4c10afc5e
parent077cda8f55ec6cbbe2b6d177b9a4040e427ea259
parent298fe0a0641620ade7eb660a066fdd8e13c80c6e
Merge branch 'hotfix/1.1.4'