Merge branch 'hotfix/2.3.1' v2.3.1
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 26 Jul 2016 15:08:09 +0000 (11:08 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 26 Jul 2016 15:08:09 +0000 (11:08 -0400)
commit3df2d3ea2bfb6486d2f064d27375e88de9345f4e
treec102440b3978f06afb1bf8cf17cc02f561bc91b9
parentf861fcccead0831d7b4b9a70d5f3116a8a995eeb
parent580960671026979a5a2a1971448fdaf8ff3ae9d6
Merge branch 'hotfix/2.3.1'