Merge branch 'hotfix/2.1.14' v2.1.14
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:55:42 +0000 (17:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:55:42 +0000 (17:55 -0400)
commit812d4e9023a08a903da31f891c69ae9a51044f5a
treedffb44ce1ff8228e20037222c472d8474a78c95c
parent8a41f386ca8f6a0b90f5d57b16ee4e978c478500
parentf265a5523ec092ee54e9d332dcabbdddbf6fa110
Merge branch 'hotfix/2.1.14'