Merge branch 'hotfix/2.1.24' v2.1.24
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:22:15 +0000 (13:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:22:15 +0000 (13:22 -0400)
commit0a59b64c178233524419fdc914ec389846033812
treec62a8cc44b5ab71e1e3b1b91782926ce6aa72fff
parent3fd21f9673ec03d59794a015689b9992b57a6561
parented6b575558f77f918f1df4743e889c56e06492f6
Merge branch 'hotfix/2.1.24'