Merge remote branch 'spunky/rfe620'

Browse source

Conflicts:
	docs/changelog/7.x.x.txt
	docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg

...

This commit is contained in:

Doug Bell 2010-04-19 17:25:30 -05:00

parent b7dd49d3ae dd72159db0

commit e60c6fdc91

10 changed files with 336 additions and 16 deletions

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

Download patch file Download diff file Expand all files Collapse all files

BIN

docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg

View file

Binary file not shown.