Merge remote-tracking branch 'upstream/WebGUI8' into 8

Browse source

Conflicts:
	docs/previousVersion.sql

...

This commit is contained in:

Doug Bell 2011-06-17 20:15:24 -05:00

parent 795d88e7e5 1d23bcf846

commit 02c0da33e4

7 changed files with 223 additions and 2636 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

2527

docs/previousVersion.sql

View file

File diff suppressed because one or more lines are too long