Merge branch 'hotfix/1.1.26' v1.1.26
authorIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 18:07:33 +0000 (14:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 18:07:33 +0000 (14:07 -0400)
commit37b2bf05f8835ff89ac49668ed0559ec989696e6
treebf19579616da05c7599050e1aadab173347d9c48
parent6b7c1c41c7f605994fb207a66e690dc816266e16
parent20362d31385212349ebf39111393713cab94a33a
Merge branch 'hotfix/1.1.26'