Merge remote-tracking branch 'upstream/7.x' into 7.x

Conflicts: islandora_basic_collection/css/islandora_basic_collection.theme.css
13 years ago · 0aec5e1fda
2 changed files with 3 additions and 3 deletions
--- a/islandora.module
+++ b/islandora.module
@ -96,7 +96,7 @@ function islandora_menu() {
  $items['islandora'] = array(
    'title' => 'Islandora Repository',
    'page callback' => 'islandora_view_default_object',
-    'type' => MENU_CALLBACK,
+    'type' => MENU_NORMAL_ITEM,
    'access arguments' => array(FEDORA_VIEW),
  );