Merge branch 'master' into 8-merge
Conflicts: docs/gotcha.txt docs/upgrades/upgrade_7.9.8-7.9.9.pl lib/WebGUI.pm lib/WebGUI/Asset.pm lib/WebGUI/Asset/Template.pm lib/WebGUI/Asset/Wobject/Calendar.pm lib/WebGUI/Asset/Wobject/Carousel.pm t/Asset/Asset.t t/Mail/Send.t t/Session/Url.t t/lib/WebGUI/Test.pm
This commit is contained in:
commit
cd1e450c32
1229 changed files with 499 additions and 313891 deletions
|
|
@ -309,7 +309,8 @@ sub _getFeedUrl {
|
|||
|
||||
=head2 _getStaticFeedUrl ($extension)
|
||||
|
||||
Generic method for returning the static URL for a type of feed.
|
||||
Generic method for returning the static URL for a type of feed. The returned URL will be complete,
|
||||
and absolute, containing the gateway URL for this site.
|
||||
|
||||
=head3 $extension
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue