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
tommy tomson 8f72d95b0e fix in wall_item.tpl
new icon link.png
2012-03-03 01:52:53 +01:00