]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f48de79 f16a119)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 20 May 2012 18:33:15 +0000 (14:33 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 20 May 2012 18:33:15 +0000 (14:33 -0400)
* remotes/upstream/master:
  search with leading @ performs directory search (# for tag search), nothing for text search
  Darkzero-NS + 'Friendicaland' countries.
  set comment permissions explicitly to parent permissions

* master:


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