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
friendica 0e3b9097f6 spec directory 2012-03-09 19:50:31 -08:00
Renamed from zot.txt (Browse further)