Merge branch 'hotfix/1.5.15' v1.5.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Jul 2017 14:35:37 +0000 (10:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Jul 2017 14:35:37 +0000 (10:35 -0400)
commit74204c069a88d97ba028c70ee7f83552ebacb9f8
tree16e89a1a29099ef20288da9e8dc9ae5028c4160d
parent56a98d1e73c03ad53cf6a6a2c2762526eb7a205a
parent60b03973238aae8548ba131d889c505933107f3c
Merge branch 'hotfix/1.5.15'