friendica/friendica
6
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 20:11:41 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity
friendica/images/friendica.svg
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

241 lines
7.2 KiB
XML
Raw Blame History