diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /engine/tests/test_files/plugin_18 | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to 'engine/tests/test_files/plugin_18')
| -rw-r--r-- | engine/tests/test_files/plugin_18/manifest.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml index 23f0fa0bf..e0776ffc1 100644 --- a/engine/tests/test_files/plugin_18/manifest.xml +++ b/engine/tests/test_files/plugin_18/manifest.xml @@ -6,8 +6,8 @@ <blurb>A concise description.</blurb> <description>A longer, more interesting description.</description> <website>http://www.elgg.org/</website> - <copyright>(C) Elgg 2010</copyright> - <license>GNU Public License version 2</license> + <copyright>(C) Elgg Foundation 2011</copyright> + <license>GNU General Public License version 2</license> <requires> <type>elgg_version</type> @@ -34,7 +34,6 @@ <category>ServiceAPI</category> - <admin_interface>simple</admin_interface> <activate_on_install>true</activate_on_install> <requires> |