Merge branch 'hotfix/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:54:28 +0000 (09:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:54:28 +0000 (09:54 -0500)
commit766b76e140815677ac365aabac89dbaecf5c3620
tree2ecbc9f7c3268d151d83edd26788c5f431456aed
parenta9ff90b084717f9c2862e306baeae175e2adc6d1
parent741a692bec7e0b20277b62e840168c1b709a45a7
Merge branch 'hotfix/1.2.6'