Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 20:16:33 +0000 (15:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 20:16:33 +0000 (15:16 -0500)
commitaee29cf74459dad449c016a9bb88a978e607ab0c
treec36987d9ad47d02494d47319881467aa44fd6f21
parent51d37a9d475b75bd2b99882bfd51dc527cd88143
parentb4b3845a002c6c758c7fbbd23301bb64e8f33650
Merge branch 'hotfix/1.2.3'