Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 16:13:43 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 16:13:43 +0000 (12:13 -0400)
commita793e72ef66f4da3059a32600df7519288207104
tree8cd9fc635402bb2d03f289742bb5f09635274a95
parent04a98b93d1ae2b4e36743e8f7fbd4d699c50b077
parent6946d8aa9eb3268e365cc38661a147f6010270ae
Merge branch 'hotfix/1.2.3'