Colin Kuskie 5febc0ebbc Merge commit '41575d24bb' into webgui8. Some tests still failing. ... Conflicts: docs/gotcha.txt lib/WebGUI.pm lib/WebGUI/Asset.pm lib/WebGUI/Asset/File/GalleryFile/Photo.pm lib/WebGUI/Asset/Post.pm lib/WebGUI/Asset/Template.pm lib/WebGUI/Asset/WikiPage.pm lib/WebGUI/Asset/Wobject/WikiMaster.pm lib/WebGUI/Cache.pm lib/WebGUI/Content/Setup.pm lib/WebGUI/Role/Asset/Subscribable.pm lib/WebGUI/Shop/Cart.pm lib/WebGUI/Shop/Pay.pm lib/WebGUI/Shop/PayDriver/ITransact.pm sbin/testEnvironment.pl t/Asset/WikiPage.t t/Shop/PayDriver.t t/Shop/PayDriver/ITransact.t t/Shop/PayDriver/Ogone.t t/Shop/TaxDriver/EU.t t/Shop/TaxDriver/Generic.t t/Workflow/Activity/RemoveOldCarts.t t/lib/WebGUI/Test.pm		2010-06-25 23:25:26 -07:00
..
AlwaysHidden.pm
AutoSynopsis.pm	Merge commit '41575d24bb' into webgui8. Some tests still failing.	2010-06-25 23:25:26 -07:00
Comments.pm
Installable.pm
JSONCollateral.pm
RssFeed.pm
SetStoragePermissions.pm
Subscribable.pm	Merge commit '41575d24bb' into webgui8. Some tests still failing.	2010-06-25 23:25:26 -07:00