Merge branch 'hotfix/1.1.23'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:14:26 +0000 (17:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:14:26 +0000 (17:14 -0400)
commit876e5386ae0b2b294af3ca44dcfca32b928f656b
treeaa39980001a783644cd7ddd4f79cbaf146122809
parent4e6e455bd1eb80392c2e027d9a42c211e0bc4f5b
parent8d9e7ff21900e74b884ac543f42212803d92e498
Merge branch 'hotfix/1.1.23'