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

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

* remotes/upstream/master:
  Added docblox default configuration file.
  fixed apps css

* master:
---

1bed4010aa5dc711be674b41fac97d1448f4e5cd