yohan 02185ad7e4 Merge branch 'yohan' into HEAD ... Conflicts: www/bookmarks.php www/importNetscape.php Successful merging.		2015-09-13 04:52:16 +02:00
..
locales	Merge branch '0.98'	2012-01-20 22:10:30 +01:00
schema	Merge branch 'master' into privatekey2	2011-06-04 00:38:07 -04:00
templates	Merge branch 'yohan' into HEAD	2015-09-13 04:52:16 +02:00
config.default.php	Add support for phancap website thumbnailer.	2014-04-23 23:12:55 +02:00
config.php.dist	Changed commit comment information	2013-03-18 23:06:36 +01:00
tables-postgresql.sql	Implement patch #3476011: PostgreSQL tables can not be initialized	2012-01-20 14:24:33 +01:00
tables.sql	Fixed SQL structure for PrivateKey	2011-05-14 23:08:46 -04:00