Merge branch '7.x' into 7.x-release · 02fa996dca - islandora - Git Tea UPei

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

Conflicts:
	islandora.info

pull/261/merge

jonathangreen 14 years ago

parent

0a7c608c41 3688f27b5d

commit

02fa996dca

1 changed files with 1 additions and 0 deletions

Unified View

								
									1

islandora.info

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