Merge branch 'hotfix/1.2.9' v1.2.9
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 13:51:00 +0000 (09:51 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 13:51:00 +0000 (09:51 -0400)
commit6f8ceba3af8485f134c0352219223b0111be4c4e
tree028329a7e445d1d071cffa8f9caacf2fc56e8236
parent6ff58aee447d43819ebe6ad0b140ccdda27e473d
parent4730aa4173c4649cb5739e509c19d55db9ee455b
Merge branch 'hotfix/1.2.9'