Merge tag 'v2.1.9' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 20 Jun 2016 16:51:03 +0000 (12:51 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 20 Jun 2016 16:51:03 +0000 (12:51 -0400)
commit3ee24fe04f2196736b40de698e8b663da4204d82
tree952f2179b82f17f018770e9efb720a82873fa140
parent031db679fc6cf34a8c2dfd386ad0d043c4a9cdfc
parent9dc17bed1c4c45940442538e8b619ddb22019616
Merge tag 'v2.1.9' into develop

Updated version #

Conflicts:
index.php
index.php