Merge branch 'hotfix/1.6.60' v1.6.60
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 17:14:27 +0000 (13:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 17:14:27 +0000 (13:14 -0400)
commit50bfa2e127f8ac230a6190316be5177d4af4a237
tree82d6f649f5cc95ab2f1770739ac6bebe4b0651b3
parent680399f6893635edd03457f69623439ec4f601d4
parent5b36c29a32ad0609520cb73933c13ae9590ae620
Merge branch 'hotfix/1.6.60'