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
..
Tidy
Bdo.php
CommonAttributes.php
Edit.php
Forms.php
Hypertext.php
Image.php
Legacy.php
List.php
Name.php
NonXMLCommonAttributes.php
Object.php
Presentation.php
Proprietary.php
Ruby.php
SafeEmbed.php
SafeObject.php
Scripting.php
StyleAttribute.php
Tables.php
Target.php
Text.php
Tidy.php
XMLCommonAttributes.php