Merge tag 'V1.2.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 May 2017 17:17:21 +0000 (13:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 May 2017 17:17:21 +0000 (13:17 -0400)
commit8625eb4b37c1d278660816726616715242a87c26
tree7d00beedeefe0321f22a6f391397996c204484d3
parent3a082b10a1449274e91f509d3006360ec1d203b6
parentab253a7ae4e5d17b82b1739597aff4c500552c88
Merge tag 'V1.2.21' into develop

v1.2.21