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	83e9f57459	fixed admin ... fixed editor	2012-03-03 16:49:48 +01:00
tommy tomson	60adef2463	fix text-editor in theme	2012-03-03 13:27:39 +01:00