Merge branch 'hotfix/1.2.1'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:51:56 +0000 (12:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:51:56 +0000 (12:51 -0400)
commitaf0e674833e4ecd1b90205212df362045d78f339
treecff35bd6f8503d8a5b1a1730db7c09a483b48eb3
parent49d8ec681bc309ae57d90986223978f5bcf2263d
parent03c4264dbb51ad753f13317d583805133cafdb9c
Merge branch 'hotfix/1.2.1'