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

Browse source

Conflicts:
	include/config.php
	update.php

...

This commit is contained in:

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

parent cbf4544887 9b6e91086b

commit 355c42cb30

1809 changed files with 48790 additions and 7152 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

tests/autoname_test.php Executable file → Normal file

Unescape Escape View file

0

tests/contains_attribute_test.php Executable file → Normal file

Unescape Escape View file

0

tests/expand_acl_test.php Executable file → Normal file

Unescape Escape View file

0

tests/template_test.php Executable file → Normal file

Unescape Escape View file