oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git@github.com:plainblack/webgui

Browse source 
Conflicts:

	docs/upgrades/upgrade_7.8.0-7.8.1.pl
This commit is contained in:
daviddelikat 2009-10-01 06:01:48 -05:00
commit 5f3477be4a
17 changed files with 347 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/i18n/English/Asset_Navigation.pm
View file

@ -544,8 +544,8 @@ be useful, others may not.|,
},
'assetsToInclude' => {
message => q|A newline separated string containg the kids of assets to include in the Navigation, by relationship. Ancestors, the asset itself, siblings, descendants and/or pedigree.|,
lastUpdated => 1253162657,
message => q|A newline separated string containing the kids of assets to include in the Navigation, by relationship. Ancestors, the asset itself, siblings, descendants and/or pedigree.|,
lastUpdated => 1254329336,
},
'startType' => {