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

..

Builder

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

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

Interchange

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

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

schema

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

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

Exception.php

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

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

Interchange.php

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

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

InterchangeBuilder.php

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

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

schema.ser

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

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

Validator.php

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

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

ValidatorAtom.php

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

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