]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 395a953) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 8 Mar 2012 03:30:46 +0000 (22:30 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 8 Mar 2012 03:30:46 +0000 (22:30 -0500)
commitd90c830332899629a6016f1767bb7dff7d0d56a9
tree916466abe6ad95f256bfc102a519513d50984fcctree | snapshot
parent395a9530dcbca95b2f2c7dde9df21ee1981fa19fcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  still getting parent relays on remote systems
  revup

* master:
Unnamed repository; edit this file 'description' to name the repository.