Merge branch 'hotfix/1.1.25' v1.1.25
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Sep 2017 21:02:13 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Sep 2017 21:02:13 +0000 (17:02 -0400)
commit55691e53246a1a40cf43a0a18e9a95cf1476d476
tree6338589175e9b669e54c987b7f5880bb6fcce53c
parent3e18e2a28a2b870a7f4f3d88290e23e6cb543658
parentab9da72dc724ec7bb9a7f0d0e3477467829c7afe
Merge branch 'hotfix/1.1.25'