Merge branch 'release/1.2.0' v1.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:50:44 +0000 (13:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:50:44 +0000 (13:50 -0400)
commitdb1fa24f4da1d8a8e2adab21d83ec8095c4f2da2
tree14f1203662131579da40ae67e076c7089e46e62a
parentbabd8da36014fe2964eca97780bb7fe2f6ecf56e
parent749582f356fa3f88f02b267ede72696a27193491
Merge branch 'release/1.2.0'