diff options
| author | colings <colings@example.com> | 2011-02-13 10:46:43 -0600 |
|---|---|---|
| committer | colings <colings@example.com> | 2011-02-13 10:46:43 -0600 |
| commit | d759d47ef99ebde158620f43ab46a83f445d9e53 (patch) | |
| tree | 4b4f9a53d721ac02e8762d9c543ad479faa97bae /modules/image_block | |
| parent | 02a349f68ac480d5b1a630e14b4f2e3558328673 (diff) | |
| parent | d2c77fd0590501f7b6b51d9f4cc033ed9485b082 (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'modules/image_block')
| -rw-r--r-- | modules/image_block/helpers/image_block_block.php | 2 | ||||
| -rw-r--r-- | modules/image_block/helpers/image_block_installer.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php index 43ce4af9..44e63a29 100644 --- a/modules/image_block/helpers/image_block_block.php +++ b/modules/image_block/helpers/image_block_block.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2010 Bharat Mediratta + * Copyright (C) 2000-2011 Bharat Mediratta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php index 27097216..1b41bc0e 100644 --- a/modules/image_block/helpers/image_block_installer.php +++ b/modules/image_block/helpers/image_block_installer.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2010 Bharat Mediratta + * Copyright (C) 2000-2011 Bharat Mediratta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |