Merge branch 'hotfix/1.1.22' v1.1.22
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:10:28 +0000 (17:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:10:28 +0000 (17:10 -0400)
commit4e6e455bd1eb80392c2e027d9a42c211e0bc4f5b
treeede928a003505a4cb02719d7b120b7259b31ccdb
parent65bd01efb1fbbb968d74affeb678f8b329a5c213
parentf29c423b1247db49db27707dd0572a4094e58984
Merge branch 'hotfix/1.1.22'