Merge tag 'v1.2.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 19:57:35 +0000 (15:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 19:57:35 +0000 (15:57 -0400)
Version 1.2.2

1  2 
index.php

diff --cc index.php
Simple merge