Permalink
Browse files

Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/helpers/items_rest.php
  • Loading branch information...
2 parents 29a8ba9 + 83ce637 commit b5b9aeb22cd8af74ce9c396de43ca3db500447e2 @talmdal talmdal committed May 16, 2010
Showing with 0 additions and 1 deletion.
  1. +0 −1 modules/gallery/helpers/items_rest.php
@@ -88,5 +88,4 @@ private static function format_restful_item($item) {
return $item_rest;
}
-
}

0 comments on commit b5b9aeb

Please sign in to comment.