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
tony baldwin cf17606d0f added Vijay's theme from facepark.in 2012-03-21 01:33:48 -04:00