clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,037 Commits 3 Branches 0 Tags
a0734ceede4f7d9da5f5e4d15e8fc7d9664edd5f
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
Mike Macgirvin
ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00