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 /COPYRIGHT.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 'COPYRIGHT.txt')
| -rw-r--r-- | COPYRIGHT.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index ac653594c..76781f25a 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -3,8 +3,7 @@ code to the Elgg project and share the copyright. (In alphabetical order.) Organizations: The MITRE Corportation (jricher@mitre.org) -Curverider Ltd (richard@elgg.com) -Hedgehogs (http://hedgehogs.net/) +Curverider Ltd (info@elgg.com) Individuals: Cash Costello (cash.costello@gmail.com) |