]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d5d853f)
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)
* 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:


No differences found
Unnamed repository; edit this file 'description' to name the repository.