Merge branch 'hotfix/1.2.20' v1.2.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 10 Mar 2017 20:51:37 +0000 (15:51 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 10 Mar 2017 20:51:37 +0000 (15:51 -0500)
commitd4135c3c9825df783eb097c1aa8c987b8fabbd05
treecc6619c9140114833de00b2f2b28480bb29f7454
parentdcd73d17b42bceac9343a6fdc7f0563bdd0d44a8
parent425735e96a5650de1031685de9775b9e1bad9963
Merge branch 'hotfix/1.2.20'