Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Jun 2017 18:18:06 +0000 (14:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Jun 2017 18:18:06 +0000 (14:18 -0400)
commit2f532c5383bb63b9b4d305e6eb35eed0760cef94
tree96ce8be73d3acd0ee11634a975a29414d0b0c6a1
parent310f5c7795094c165fbcccad9ac2c91dd68826f2
parentc714faf2313d7a14e4840ffcb6fd81168574ace5
Merge branch 'hotfix/1.0.5'