Mark Pemberton b628e63e01 Merge branch 'master' into privatekey2 ... Conflicts: data/templates/default/bookmarks.tpl.php		2011-06-04 00:38:07 -04:00
..
locales	add SSL client certificate translations for german (de_DE)	2011-05-11 18:00:31 +02:00
schema	Merge branch 'master' into privatekey2	2011-06-04 00:38:07 -04:00
templates	Merge branch 'master' into privatekey2	2011-06-04 00:38:07 -04:00
config.default.php	implement request #1989987: theme support. merge themes branch with --squash	2011-05-25 19:43:36 +02:00
config.php.dist	Revert "Revert "Updates for configurable-privacy2, hopefully without carriage returns.""	2011-03-31 16:18:36 -07:00
tables.sql	Fixed SQL structure for PrivateKey	2011-05-14 23:08:46 -04:00