Merge branch 'hotfix/1.2.18' v1.2.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:24:59 +0000 (09:24 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:24:59 +0000 (09:24 -0500)
commitfea2aa41098aa717bf079313d5bef2bdac73056b
tree493a090268357cbf868b2d3d5296ec7e6bb1d9f0
parent854f675735d7db75cb3ae06ced16caf88495fd8a
parent0bf331c19cd5c1b542a5f967191c6393a3155f90
Merge branch 'hotfix/1.2.18'