From 1d5606617e11aaa855af7edc6c440f6b4aa5863a Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Sun, 03 Jun 2012 10:56:18 -0400 Subject: [PATCH] Fix reference to GPL in about page --- skins/larry/templates/about.html | 3 ++- skins/default/templates/about.html | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/skins/default/templates/about.html b/skins/default/templates/about.html index 2a78d51..f511806 100644 --- a/skins/default/templates/about.html +++ b/skins/default/templates/about.html @@ -16,10 +16,11 @@ <div id="license"> <roundcube:object name="aboutcontent" /> <h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2> -<p class="copyright">Copyright © 2005-2011, The Roundcube Dev Team</p> +<p class="copyright">Copyright © 2005-2012, The Roundcube Dev Team</p> <p class="license">This program is free software; you can redistribute it and/or modify -it under the terms of the <a href="http://www.gnu.org/licenses/gpl-2.0.html" target="_blank">GNU General Public License version 2</a> -as published by the Free Software Foundation. +it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a> +as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/> +Some <a href="http://roundcube.net/license">exceptions</a> for skins & plugins apply. </p> <p class="links"><roundcube:object name="supportlink" label="support" target="_blank" /></p> </div> diff --git a/skins/larry/templates/about.html b/skins/larry/templates/about.html index 2236ba5..4fddfc5 100644 --- a/skins/larry/templates/about.html +++ b/skins/larry/templates/about.html @@ -13,7 +13,8 @@ <p class="copyright">Copyright © 2005-2012, The Roundcube Dev Team</p> <p class="license">This program is free software; you can redistribute it and/or modify it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a> -as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/> +Some <a href="http://roundcube.net/license">exceptions</a> for skins & plugins apply. </p> </div> -- Gitblit v1.9.1