Changeset [ba19cffc4572866850a579b546802b029a3e4696] by Phillip Ball
Revision ba19cffc4572866850a579b546802b029a3e4696,
committed by Phillip Ball
· March 2nd, 2011 @ 09:43 PM
Merge branch 'master' of https://github.com/dleffler/exponent-cms
into dleffler-master
https://github.com/exponentcms/exponent-cms/commit/ba19cffc45728668...
17 changed files
-
M
framework/modules/administration/menus/admin.php -
M
framework/modules/migration/controllers/migrationController.php -
M
framework/modules/migration/views/migration/manage_users.tpl -
M
framework/modules/users/controllers/usersController.php -
M
framework/modules/users/views/users/manage_groups.tpl -
M
modules/calendarmodule/actions/ical.php -
M
modules/calendarmodule/views/Administration.tpl -
M
modules/calendarmodule/views/Default.tpl -
M
modules/calendarmodule/views/Monthly List.tpl -
M
modules/calendarmodule/views/Past Events.tpl -
M
modules/calendarmodule/views/Upcoming Events - Headlines.tpl -
M
modules/calendarmodule/views/Upcoming Events - Summary.tpl -
M
modules/calendarmodule/views/Upcoming Events.tpl -
M
modules/calendarmodule/views/_view.tpl -
M
modules/calendarmodule/views/_viewday.tpl -
M
modules/calendarmodule/views/_viewtag.tpl -
M
modules/calendarmodule/views/_viewweek.tpl