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	f55779fd83	update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks	2012-03-20 20:47:31 -07:00