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
Alexander Kampmann 509ed2604f splitted tests into several files 2012-03-14 12:54:49 +01:00