From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 04:36:22 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2a3aaca88ded68a8ce926577d3faea2f3ef0ab50;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  some admin page fixes and cleanup
  changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
  string update
  some testbubble stuff
  can_write_wall documentation

* master:
---