diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/KohanaLicense.html | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/KohanaLicense.html')
| -rw-r--r-- | system/KohanaLicense.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/KohanaLicense.html b/system/KohanaLicense.html index de2d5299..bc4bce28 100644 --- a/system/KohanaLicense.html +++ b/system/KohanaLicense.html @@ -12,7 +12,7 @@ <p>This license is a legal agreement between you and the Kohana Software Foundation for the use of Kohana Framework (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.</p> -<p>Copyright (c) 2007-2008 Kohana Team<br/>All rights reserved.</p> +<p>Copyright (c) 2007-2009 Kohana Team<br/>All rights reserved.</p> <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p> |