]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3b303f) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 7 May 2012 04:55:53 +0000 (00:55 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 7 May 2012 04:55:53 +0000 (00:55 -0400)
commitc36e39b18ec63dd2fe827fcb2f26ad71d2f4ed4c
treeeec4dff465ba290d39c4f0b8badc32fb6bb2f70dtree | snapshot
parentb3b303f037c2142d0a388dc25b420dd1bef61eefcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
  mail autcomplete testing
  email recip autocomplete
  rev update
  diabook-theme: small fix
  diabook-theme: add "Earth Layers"-box at right_side
  diabook-theme: twitterbox-bugfix
  diabook: small fix
  diabook-theme: bugfix

* master:
Unnamed repository; edit this file 'description' to name the repository.