diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2013-06-20 22:06:28 +0200 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2013-06-20 22:06:28 +0200 |
commit | 07c6c69eca8751c0e96a846afb30c24ab2638b1f (patch) | |
tree | 6629dbd38f3e578990523b5a6591bc08f64a8c79 /plugins/acl | |
parent | 39b905b7a8abafe57f5429952db390a97ffa047f (diff) |
Make all bundled plugins the same license as Roundcube itself, which is GPLv3+
Diffstat (limited to 'plugins/acl')
-rw-r--r-- | plugins/acl/acl.php | 12 | ||||
-rw-r--r-- | plugins/acl/package.xml | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 59406262e..a840bcd58 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -9,18 +9,18 @@ * * Copyright (C) 2011-2012, Kolab Systems AG * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. */ class acl extends rcube_plugin diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml index 52e234f37..98460e82f 100644 --- a/plugins/acl/package.xml +++ b/plugins/acl/package.xml @@ -22,7 +22,7 @@ <release>stable</release> <api>stable</api> </stability> - <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> + <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license> <notes>-</notes> <contents> <dir baseinstalldir="/" name="/"> |