Merge tag 'v1.6.60' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 17:14:35 +0000 (13:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 17:14:35 +0000 (13:14 -0400)
Version 1.6.60

1  2 
index.php

diff --cc index.php
Simple merge