Merge branch 'hotfix/1.1.11' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 22 Feb 2016 17:05:34 +0000 (12:05 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 22 Feb 2016 17:05:34 +0000 (12:05 -0500)
commit4b3caa974512a163551a2a8ba590a7ce2faddfdf
treef04408a5a087e77aa9b23ddcd44da82774a427a8
parentae0c8015904e7be02c3c316c0cc112c01b84b371
parent31d57df64c58b4dbe0b7f58b48ff6c93f58765ae
Merge branch 'hotfix/1.1.11' into develop

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