Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 15:34:53 +0000 (11:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 15:34:53 +0000 (11:34 -0400)
commitad5f12ea5af98397f6a5d2b5c3ee99d14d737395
tree72e2c3d194c3d4ddbcfa640626960ccb9e88c35a
parent9a8c019c18602e8c01047f99a46d4749ad663dfa
parent03a57903ae1a9354e394ef96682565d526b61bb4
Merge branch 'hotfix/1.1.1'