Tim Almdal 0a6b540092 Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/server_add/helpers/server_add_theme.php

2009-10-24 07:28:22 -07:00

..

group.php

Standardize the use of the lookup methods

2009-10-23 10:52:42 -07:00

user_event.php

Minor changes to more closely align this branch with master

2009-10-23 06:52:08 -07:00

user_installer.php

Change the Admin_Identity_Controller to not destroy the session until after the new provider is installed.

2009-10-23 06:09:24 -07:00

user_theme.php

Created user.css. Moved user-related form css to the new sheet.

2009-10-23 22:25:36 -06:00

user.php

Created user.css. Moved user-related form css to the new sheet.

2009-10-23 22:25:36 -06:00