]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 10 May 2012 23:53:11 +0000 (19:53 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 10 May 2012 23:53:11 +0000 (19:53 -0400)
commit9c53a311de2899ca620bfaf75c58a514c55cacff
tree16093a85f3ec304b1e38719cdd7e4aa3a571ec4d
parente7b8e839ae0de9103cfca7815a5bc1917627fff4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Diabook-dark.  More touchups.
  specified background image does not exist
  diabook-theme: some fixes
  priv mail autocomplete, improved contrast for darkzero, etc.
  email autocomplete
  diabook-theme: some css/bug-fixes

* master: