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/Tidy
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
..
Name.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
Strict.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Transitional.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
XHTML.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
XHTMLAndHTML4.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00