diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-20 14:33:15 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-20 14:33:15 -0400 |
| commit | 18d4cf05833574173f1645e40e68f2c9c775517e (patch) | |
| tree | 3eefeaf641e91416fa7b43b9a36b829f28ff1983 /include/fcontact.php | |
| parent | f48de791813a914d7ce2e1ec00ba041657f3f8ac (diff) | |
| parent | f16a1199408d167bbc7c52dc408ef02b36808317 (diff) | |
| download | volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.tar.gz volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.tar.bz2 volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.zip | |
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:
Diffstat (limited to 'include/fcontact.php')
0 files changed, 0 insertions, 0 deletions