diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-05-15 23:45:28 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-05-15 23:45:28 -0700 |
| commit | b5b9aeb22cd8af74ce9c396de43ca3db500447e2 (patch) | |
| tree | dc95c530177dd9a042251ea72fac2379d55e3ab5 | |
| parent | 29a8ba959ec1ec1ebd14d12c2a102fd7d3fcd012 (diff) | |
| parent | 83ce637ce3171a012515b2e20e8592d22e9929f8 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/helpers/items_rest.php
| -rw-r--r-- | modules/gallery/helpers/items_rest.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php index 5ca6facd..32597a65 100644 --- a/modules/gallery/helpers/items_rest.php +++ b/modules/gallery/helpers/items_rest.php @@ -88,5 +88,4 @@ class items_rest_Core { return $item_rest; } - } |