Commit graph

4 commits

Author SHA1 Message Date
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
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Mike Macgirvin 16b9c58412 rely on feed item (e.g. salmon) to declare namespaces. This way we
don't cause conflict with any chosen NS prefix in the feed
2010-10-21 20:51:21 -07:00
Mike Macgirvin 5edee3c4d1 magic-envelope verification, status.net appears to do it wrong.
Ultimately we need to do it right (or why bother having a spec?),
and fallback to doing it wrong if we're talking to a broken system - which
ironically seems to include most of the federated social web projects.
2010-10-21 04:53:43 -07:00