Tim Almdal 10b4eda6f0 Merge branch 'master' of git@github.com:gallery/gallery3 ...

Conflicts:
	modules/gallery/libraries/Theme_View.php
	themes/admin_default/views/admin.html.php

2009-06-29 06:44:05 -07:00

..

admin.html.php

Merge branch 'master' of git@github.com:gallery/gallery3

2009-06-29 06:44:05 -07:00

block.html.php

Put csrf token into Admin_View and Theme_View by default, then use it

2009-03-27 03:43:21 +00:00

pager.html.php

Fix for ticket #328.

2009-06-16 21:41:44 -07:00