Merge branch 'hotfix/1.2.28' v1.2.28
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jul 2017 15:17:25 +0000 (11:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jul 2017 15:17:25 +0000 (11:17 -0400)
commit2aea54c51bcc448b951252fe47d2c60762222e1c
tree34e7bd80a5c9c8c281f64fc71c10519b3a71cb81
parent1eef06da5711c232c0e7efa85b945edb7de78b96
parent0d0fa8f1cec99a0df1f77f329e5d3ea7be5d5696
Merge branch 'hotfix/1.2.28'