Merge branch 'release/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:52:46 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:52:46 +0000 (11:52 -0500)
commit700548aecfcdaa6f46dce19ad8bb8b27960e9b82
treedc477a1308b67d27ad11af21a8cb3080a31af532
parentc6fbd4fb4d7dff68693db3f31946a232be89173f
parent7c71817e45e4152801b8f1de71c9d8e3401fe3e2
Merge branch 'release/1.2.1'