Changeset [5ec6c434f0bda428d4e0843de41008cb4c8519e3] by dleffler
Revision 5ec6c434f0bda428d4e0843de41008cb4c8519e3,
committed by dleffler
· May 2nd, 2011 @ 11:33 PM
Merge branch 'release/v2.0.0.beta2' into develop
Conflicts:
exponent_version.php
modules/formbuilder/views/_default_report.tpl
https://github.com/exponentcms/exponent-cms/commit/5ec6c434f0bda428...
8 changed files
-
A
exponent_version.php.orig -
A
modules/formbuilder/views/_default_report.tpl.orig -
M
CHANGELOG -
M
exponent_version.php -
M
framework/modules/administration/menus/user.php -
M
modules/calendarmodule/actions/ical.php -
M
modules/formbuilder/views/_default_report.tpl -
M
modules/formmodule/views/Default.tpl