Browse Source

Merge branch '7.x' into 7.x-release

Conflicts:
	islandora.info
pull/261/merge
jonathangreen 13 years ago
parent
commit
02fa996dca
  1. 1
      islandora.info

1
islandora.info

@ -6,3 +6,4 @@ core = 7.x
configure = admin/islandora/configure
stylesheets[all][] = css/islandora.base.css
stylesheets[all][] = css/islandora.theme.css
php = 5.3

Loading…
Cancel
Save