]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 04:36:22 +0000 (23:36 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 04:36:22 +0000 (23:36 -0500)
commit2a3aaca88ded68a8ce926577d3faea2f3ef0ab50
tree84e04438105e2588c17c61654be0b4d6587c8039
parent321b6516352d25fa64a987fb2efeb0502a24623e
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: