]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d5d853f) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 18 May 2012 03:01:46 +0000 (23:01 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 18 May 2012 03:01:46 +0000 (23:01 -0400)
commitc024c17b5f7253432e9c53aa642f003b537f6b6b
treeb582e2b4606637a64cc28d86c49124c7b5dcee61tree | snapshot
parentd5d853f37f5b42d4b78f823ed0fb154064ee0e70commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  setup delivery chain for private groups (work in progress)
  bring in the *much better* xml parser from the original zot branch
  rev update
  merged from wrong project
  initial commit

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