Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:38 +0000 (14:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:38 +0000 (14:29 -0400)
commitbc7cfc92736f44b02d1a3c40bd124053d861309c
treef75035b9da7d8d760c032f1d4946253c8ba57a8c
parentf875f08dd690e3d81ac01906a52536d30a45fac4
parentf623f79af0c992fe480861acb2e274019358bbb7
Merge branch 'hotfix/1.0.25'