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

..

dfrn2.odt

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

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

dfrn2.pdf

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

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

dfrn-snap2.jpg

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

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

zot.txt

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

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