]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e94856 7923404)
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)
* 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:


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