Merge branch 'hotfix/1.1.30'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 16:53:34 +0000 (12:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 16:53:34 +0000 (12:53 -0400)
commit571b65b64c8c7a2952fab1d5c6ecad7f3e4e9014
tree6466315f7e0bd27ca8714abb47272996c2ad85af
parent298bdd08b2195d979d7a62fe664d78f85402f80c
parent4dd18e8aa62646f8298d09dbe1c93c6ea3d2e8a2
Merge branch 'hotfix/1.1.30'