Merge branch 'hotfix/1.2.26' v1.2.26
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:10:15 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:10:15 +0000 (12:10 -0400)
commit98ce639a82913f0dee3779d3e2a39cb8df7b1b8b
tree50bc7ba905583590a49abd0b168a9504b798eea3
parent8a99baa8a44109b8e75dee17e799c896e397e4d3
parent81218e0ce6e5735c5df5212c0c2c1f34ac0d40df
Merge branch 'hotfix/1.2.26'