Merge branch 'hotfix/1.2.21' V1.2.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 May 2017 17:17:15 +0000 (13:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 May 2017 17:17:15 +0000 (13:17 -0400)
commitab253a7ae4e5d17b82b1739597aff4c500552c88
tree7d00beedeefe0321f22a6f391397996c204484d3
parentde07a3df40cc96e92218edec887d974e1ef68eed
parent0f6ba1572877196262a46c1341e7b7b73d64ab24
Merge branch 'hotfix/1.2.21'