Andy Staudacher e7f5e0a9a3 Merge commit 'upstream/master' ...

Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php

2009-08-30 18:27:40 -07:00

..

server_add_event.php

Tabs to spaces cleanup

2009-08-30 18:07:13 -07:00

server_add_installer.php

Remove 'ENGINE=InnoDB' specification from tables that we create. Use

2009-08-27 15:47:54 -07:00

server_add_theme.php

Use the Kohana cascading filesystem to locate resources loaded by the

2009-07-22 14:27:57 -07:00

server_add.php

Change all instances of SafeString::of_safe_html() to html::mark_safe() in views.

2009-08-30 07:00:56 -07:00