diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 12:53:33 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 12:53:33 -0700 |
| commit | 1f9d45861d68b95c4a4069e7d862a7076fae6ba4 (patch) | |
| tree | aaff4eb798244d5c647f72f2c05ae9fab7c557ed /modules/gallery/helpers/gallery_block.php | |
| parent | ab73a4092ff70a87ced1d7ffcfbe9bcee788f1f3 (diff) | |
| parent | 1c313e9d2da84a9dd839ea6a4910cdf6809007fb (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/helpers/gallery_block.php
modules/gallery/helpers/gallery_theme.php
modules/gallery/helpers/user.php
modules/user/helpers/user_event.php
Diffstat (limited to 'modules/gallery/helpers/gallery_block.php')
| -rw-r--r-- | modules/gallery/helpers/gallery_block.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php index f43d82c9..a4f4dae0 100644 --- a/modules/gallery/helpers/gallery_block.php +++ b/modules/gallery/helpers/gallery_block.php @@ -109,7 +109,6 @@ class gallery_block_Core { } break; } - return $block; } |