Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 18:09:46 +0000 (13:09 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 18:09:46 +0000 (13:09 -0500)
commit38345af3512332e83b522577a04a571a63544dc3
tree0de08f26c4cf10c5710be0361cb7e2477d976a33
parentd6bc6a87076261339568a93b1eae76fdb9202b3d
parent420086a4a725970040abbaaed23bb38abf663a53
Merge branch 'hotfix/1.0.22'