Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-12 00:23:00 +00:00
Code Issues Projects Releases Packages Wiki Activity
4812 commits 3 branches 64 tags 246 MiB
Commit graph

2 commits

Author SHA1 Message Date
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
tommy tomson
caffb217c1 fixes 2012-03-12 23:31:54 +01:00