friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
friendica/library/HTMLPurifier/HTMLModule
History
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 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Bdo.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
CommonAttributes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Edit.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Forms.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Hypertext.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Image.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Legacy.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
List.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Name.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
NonXMLCommonAttributes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Object.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Presentation.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Proprietary.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Ruby.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
SafeEmbed.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
SafeObject.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Scripting.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
StyleAttribute.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Tables.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Target.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Text.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Tidy.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
XMLCommonAttributes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00