friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
friendica/library/HTMLPurifier/AttrDef
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
..
CSS Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTML Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
URI Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
CSS.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Enum.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Integer.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Lang.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Switch.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
URI.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00