Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 16:30:20 +0000 (11:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 16:30:20 +0000 (11:30 -0500)
commit5c29ec652a5e937c31863471b9a3b96b53f652ed
treed16700b40aec332c76b9531568f16f5208b5c6f0
parent87ef28da78d66a44ee4a574f7ce89a6ad416a3f1
parent8cfc508de6b44bb37984cccf522d20c184848a11
Merge branch 'release/1.2.4'