Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:22:39 +0000 (09:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:22:39 +0000 (09:22 -0400)
commit7e1c0d82b7d1729c2ba8fb9763e7d832065074c0
treec92f5920eaf1d01f98d3926dbe207cff120ef89e
parent111357ab306eace505bba8eadd46407c8a53c77d
parent304c29ccdc75fc252f586f96a886bd6697c5e263
Merge branch 'hotfix/1.1.12'