]> git.mxchange.org Git - friendica.git/commit
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)
commit18d4cf05833574173f1645e40e68f2c9c775517e
tree3eefeaf641e91416fa7b43b9a36b829f28ff1983
parentf48de791813a914d7ce2e1ec00ba041657f3f8ac
parentf16a1199408d167bbc7c52dc408ef02b36808317
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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: