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

Merge branch 'master' into 8-merge

Browse source 
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:
Doug Bell 2010-07-14 17:06:19 -05:00
commit cd1e450c32
1229 changed files with 499 additions and 313891 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/gotcha.txt
View file

@ -7,6 +7,7 @@ upgrading from one version to the next, or even between multiple
versions. Be sure to heed the warnings contained herein as they will
save you many hours of grief.
<<<<<<< HEAD
8.0.0
--------------------------------------------------------------------
* WebGUI 8 is not API compatible with WebGUI 7. If you have custom
@ -16,6 +17,11 @@ save you many hours of grief.
* WebGUI now requires the following modules
- Moose
- CHI
=======
7.9.8
--------------------------------------------------------------------
* Starting in WebGUI 7.9.4, the Net::Twitter module is required.
>>>>>>> master
7.9.7
--------------------------------------------------------------------