]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 792f094 c8ddcbe)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Fri, 26 Feb 2010 02:13:34 +0000 (18:13 -0800)
committerZach Copley <zach@status.net>
Fri, 26 Feb 2010 02:13:34 +0000 (18:13 -0800)
commitc49fbb63c56cc851153d0fecec81b4ca92b41bc6
treeef84518fbdc879fceb6213aebb99228aec853f2atree | snapshot
parent792f0942f761fe8b29363689eb7cbe4317f64b96commit | diff
parentc8ddcbe0d32fb072456587fc554f6b78db672fa7commit | 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
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)