Merge branch 'hotfix/1.2.12' v1.2.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 17:37:16 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 17:37:16 +0000 (13:37 -0400)
commit40fbd44e92aca902dde75da8b238c9a59026b6d9
treec8e82c0e3db4bbc527f74cf6303e074c6f581e8e
parent7aaea972419191f39f2439487f932b3264860ec9
parent0397933a1aec79acdae87ba3877e2eaa0be3101e
Merge branch 'hotfix/1.2.12'