]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 24 Apr 2012 07:33:46 +0000 (03:33 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 24 Apr 2012 07:33:46 +0000 (03:33 -0400)
commit0e2c6c28198b0e27087ceea6d1ba9d1891405549
tree0d5afc1cb1934f1bedfdd8a3056133564dd8a932
parent6e9485605f64394f8e6d830b8a959a5afc85cf2d
parent7923404c836979f5da7bd7ab47b1d93d137af1cc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  separate tag search from body search
  Esperanto at 100% again
  Improvements to diabook-dark
  move unfriend to standalone function for use in account removal
  more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips

* master: