]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 12 May 2012 00:39:06 +0000 (20:39 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 12 May 2012 00:39:06 +0000 (20:39 -0400)
commit534a93f81c34b4b280986ad7e1bcee4278ea9299
tree01a59f25ace68cc384828e565e96f4d1e9715619
parent9c53a311de2899ca620bfaf75c58a514c55cacff
parent2454028ef61a3ea1dd8308896c8bbf1f04f97ac9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Darkzero - fixed notifications bar.
  diabook-theme: update mapquery and small fix
  diabook-theme: add "population density 2010"-layer to EarthLayers-box
  fix search/new against possible email leakage
  better test of email reply visibility
  diabook-theme:small fix
  moderated comment templates
  diabook-theme: small fix
  diabook-theme: include prv_message autocomplete
  fix PM replies after autocomplete changes
  add photos to PM autocomplete, improved appearance
  rev update
  diabook-theme: small fix

* master: