Browse Source

Merge branch '6.x' of git://github.com/Islandora/islandora into 6.x

Conflicts:
	CollectionClass.inc - chunk moved due to intro of XSLT-less collection view
	ObjectHelper.inc - chunk extracted into separate function
	fedora_repository.install - syntax error fixed...

pull/99/head

Adam Vessey 13 years ago

parent

8cebf38560 0f15711e4b

commit

cfc6a4f6e7

2 changed files with 3 additions and 3 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save