friendica-github/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00

3.7 KiB
16x16px