aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-07 22:30:46 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-07 22:30:46 -0500
commitd90c830332899629a6016f1767bb7dff7d0d56a9 (patch)
tree916466abe6ad95f256bfc102a519513d50984fcc
parent395a9530dcbca95b2f2c7dde9df21ee1981fa19f (diff)
downloadvolse-hubzilla-d90c830332899629a6016f1767bb7dff7d0d56a9.tar.gz
volse-hubzilla-d90c830332899629a6016f1767bb7dff7d0d56a9.tar.bz2
volse-hubzilla-d90c830332899629a6016f1767bb7dff7d0d56a9.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: still getting parent relays on remote systems revup * master:
0 files changed, 0 insertions, 0 deletions