Merge branch 'release/1.2.15' v1.2.15
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 18:50:50 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jun 2017 18:50:50 +0000 (14:50 -0400)
commit381ed8351d38fa17f78859f4d20e650a8a7aaeff
tree1a4b5de280175b235e8d85a9adec5e100b4ac2aa
parent8fff1758e333c60d19e6f7f4df2c29df35c060d3
parent76d5fc239b18799a566068d3cdbfa94a1a84ff1c
Merge branch 'release/1.2.15'