Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 30 Nov 2017 16:47:09 +0000 (11:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 30 Nov 2017 16:47:09 +0000 (11:47 -0500)
commit53dc3b50b7075b2c2777a957f6d0a8f15ec1df5e
tree4f2713fb690767701dfebb4a0e857b1563fb92fc
parentb8708ae1867969807cb2fc9f7a090d3f2dc52571
parent687b618cdd81aa418c92a591c15d7c7c4b0d588c
Merge branch 'hotfix/1.0.22'