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
friendica	f95fb2667a	vier navbar messed up after default theme template move	2012-03-28 00:16:22 -07:00