Merge tag 'v1.1.25' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 14 Jul 2017 16:03:34 +0000 (12:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 14 Jul 2017 16:03:34 +0000 (12:03 -0400)
commit4e371f17980b3e3496a9fba4a37cf0baeec526da
tree62996a0dd6c5540a601bbdd587ca2779743ca627
parentaea00e206e692c51b754214eb8095c096dc13054
parentd2c74e52b9f6785f578ac4414b4030744c1dd950
Merge tag 'v1.1.25' into develop

version 1.1.25