Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:28:57 +0000 (17:28 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:28:57 +0000 (17:28 -0500)
commit29456a022ef58369e3ccc644fc5a413578ccb9c1
treefbd8ac81a40d672ace15628ff407782f3732186f
parent79c3087472fd324d49f30837063a60439301c7ac
parentd5216303983e9c1375386533f6af3d782b43b93e
Merge branch 'hotfix/1.0.18'