Christian Weiske a697e846ca Merge branch 'master' into quickform ... Conflicts: data/locales/ru_RU/LC_MESSAGES/messages.po		2010-06-01 16:42:01 +02:00
cache	import of scuttle 0.7.2	2007-12-12 16:29:16 +00:00
data	Merge branch 'master' into quickform	2010-06-01 16:42:01 +02:00
doc	update changelog	2010-05-03 08:01:46 +02:00
scripts	Implement request #2833793: Export to avahi config files	2010-01-19 23:01:36 +00:00
src	backgroundtext is an own package now	2010-05-26 19:01:07 +02:00
tests	test that public bookmarks of other people are not exported via csv	2010-03-28 18:09:59 +00:00
www	use new file docblock for register.php	2010-05-27 08:43:22 +02:00
.gitignore	move version into build.xml	2009-11-13 23:15:30 +00:00
build.properties.dist	move version into build.xml	2009-11-13 23:15:30 +00:00
build.xml	prepare 0.96.1	2010-02-09 15:55:01 +00:00