Merge branch 'hotfix/1.1.14' into develop develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 5 Apr 2017 19:21:52 +0000 (15:21 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 5 Apr 2017 19:21:52 +0000 (15:21 -0400)
commit5ad436264986fae05efbb1b57a19a9e31ce789fc
tree1d8a3ee6dcf6637e2ddbaaeea630a0f58cc3694e
parent4bc2deb57e66ca176b02a86f77d60e710f74a6e7
parent21be3ac4ee614890c8e846552b6e9af908d1ff8c
Merge branch 'hotfix/1.1.14' into develop

Conflicts:
templates/template.html
templates/template.html