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
Friendika
ca826c7ff2 images were left behind in theme rename 2011-02-08 23:24:19 -08:00