diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
| commit | 77f15dc6ba5d3308d42e8f75103c3193d3796dd2 (patch) | |
| tree | 7e1a86f8b0ff954780a28bdea6c956649cf36d57 /license.txt | |
| parent | 110b467503f7a749aec685be445468c0f98b9e2a (diff) | |
| parent | 916b176594bcf175417423f33711ac0cbb4082e7 (diff) | |
Merge remote-tracking branch 'remotes/upstream/2.2-stable' into working
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Conflicts:
system/libraries/Session.php
user_guide/
Diffstat (limited to 'license.txt')
| -rw-r--r-- | license.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/license.txt b/license.txt index 061cdb9db..0973fd37b 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2008 - 2011, EllisLab, Inc. +Copyright (c) 2008 - 2014, EllisLab, Inc. All rights reserved. This license is a legal agreement between you and EllisLab Inc. for the use |