]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 26 Apr 2012 04:20:00 +0000 (00:20 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 26 Apr 2012 04:20:00 +0000 (00:20 -0400)
commit6b830bfa97121ea6388722ef483440360ff4d4dd
tree61d32f6dd516a9cbe0d38fa0898536d6ed537702
parent78280bdfed363f2316f1fa4e854e9604ebd58470
parent20a9cdfc90dca68d431eb648018cd95617747b23
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Diabook-dark more CSS fixes.

* master: