3 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	173fb983c5	navbar fix	2012-03-03 23:12:03 +01:00
tommy tomson	d138d07c05	fixes in wall_item.tpl and style.css in theme diabook	2012-03-03 04:27:06 +01:00