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 /README.txt | |
| 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 'README.txt')
| -rw-r--r-- | README.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/README.txt b/README.txt index 0d4015238..3cffcc8c7 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ Elgg -Copyright (c) 2008-2010 See COPYRIGHT.txt +Copyright (c) 2008-2011 See COPYRIGHT.txt See CONTRIBUTORS.txt for development credits. @@ -15,7 +15,7 @@ The Elgg project was started in 2004 by: Ben Werdmuller <ben@benwerd.com, http://benwerd.com> and Dave Tosh <davidgtosh@gmail.com> -Elgg is released under the GNU Public License (GPL) Version 2 and the +Elgg is released under the GNU General Public License (GPL) Version 2 and the Massachusetts Institute of Technology (MIT) License. See LICENSE.txt in the root of the package you downloaded. |