Commit Graph

2 Commits (28df35052a452ad992ad8d67cffbfa380759e414)

Author SHA1 Message Date
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
11 years ago
friendica 0e3b9097f6 spec directory 11 years ago