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

..

autoname_test.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

contains_attribute_test.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

expand_acl_test.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

get_tags_test.php

removed done TODO

2012-03-14 12:31:25 +01:00

template_test.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

xss_filter_test.php

another test for xmlify

2012-03-15 10:51:22 +01:00