Merge branch 'master' into careminster-presence-refactor

Browse Source

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

...

This commit is contained in:

Melanie

2010-09-13 16:16:40 +01:00

parent d264f0d301 18a9ac6b39

commit 6a1ce17cdb

216 changed files with 6585 additions and 4483 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

1181

prebuild.xml

File diff suppressed because it is too large Load Diff