summaryrefslogtreecommitdiff
path: root/tpl
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-25 18:13:34 -0800
committerZach Copley <zach@status.net>2010-02-25 18:13:34 -0800
commitc49fbb63c56cc851153d0fecec81b4ca92b41bc6 (patch)
treeef84518fbdc879fceb6213aebb99228aec853f2a /tpl
parent792f0942f761fe8b29363689eb7cbe4317f64b96 (diff)
parentc8ddcbe0d32fb072456587fc554f6b78db672fa7 (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: init_conversation.php script to copy old notice conversations into the conversation table cache results of webfinger lookups Parse an hcard for hints, if available use new hcard method for webfinger add hkit for hCard parsing use new dedicated hcard method for Webfinger profile Add an hcard action
Diffstat (limited to 'tpl')
0 files changed, 0 insertions, 0 deletions