]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 03:20:42 +0000 (22:20 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 03:20:42 +0000 (22:20 -0500)
commit290fdefa82dd0662bc3f1935dd575e60f7809530
tree5d1334cd04a73cdf12ab46b0df38450b68c0b28c
parent04527bd0b1ef9610964ffe630f2a4b0bee679220
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  wrap title and text for editplain in zero and TB themes
  correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
  improved contrast in acl selector, and preview (darkzero)

* master: