]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f488c7 26156e1)
Merge remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 28 Jun 2012 16:12:43 +0000 (12:12 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 28 Jun 2012 16:12:43 +0000 (12:12 -0400)
* remotes/upstream/master:
  fix logic for nested lists--should be OR, not AND


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.