Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 16:05:05 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 16:05:05 +0000 (12:05 -0400)
commit25a34dbb14ed52d732500254bb880500d53eff9b
tree5966fbb655378bd658e2e18350f251203373f81e
parent6f369bb50725dea91d9d8b93f3a44934fdc38405
parent8784bfa352ea432ef9c93323ac563341087dd695
Merge branch 'hotfix/1.0.12'