Brion Vibber
|
9df856e667
|
Merge branch '0.9.x' into merge
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
|
2010-12-07 10:50:05 -08:00 |
Evan Prodromou
|
fcc0825b14
|
Make userxrd part of the default hostmeta
|
2010-11-26 21:46:51 -05:00 |
Craig Andrews
|
3f3b38766f
|
move xrd and hostmeta out of the OStatus plugin and into core
add event for setting up hostmeta, and use them in the OStatus plugin
|
2010-11-26 21:12:14 -05:00 |
|
Brion Vibber
|
aa02f6020e
|
Merge branch '0.9.x' into 1.0.x
|
2010-10-08 11:47:50 -07:00 |
|
Craig Andrews
|
8d54809c35
|
move xrd and hostmeta out of the OStatus plugin and into core
add event for setting up hostmeta, and use them in the OStatus plugin
|
2010-09-07 13:45:52 -04:00 |