Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:41:09 +0000 (09:41 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:41:09 +0000 (09:41 -0400)
commit479cb045599cc57ab2d9487d2022bfb699595140
tree1bb5d6dd9b4218a92f92d7aaae4d556b3b057a36
parentdf37771970168a9217a423035fe18d3ed4209a70
parentefff84e78505f689f35fc810fb862c9aa379c4a6
Merge branch 'hotfix/1.0.25'