Merge branch 'hotfix/1.1.7' master v1.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 17:36:59 +0000 (13:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 17:36:59 +0000 (13:36 -0400)
commit1bd62477e4a1a7730bbcd1bd77b53b9a2c7d25dc
tree16ce1d178319b1120c28a6decabeb3f5b07b5859
parent065c3bb37051e59a0e3b2e967aa54d1b841f09a6
parent28db81b467f3aa8a35bda0ef893a04462f533809
Merge branch 'hotfix/1.1.7'