]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 21:49:22 +0000 (16:49 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 21:49:22 +0000 (16:49 -0500)
commit1bed4010aa5dc711be674b41fac97d1448f4e5cd
tree9df2534f2194b23931ffe27b160481c58789b100
parentda78d8594f79792f2c144cdb5b76b561ec03b278
parent952bcc5158eade15d551a523647d861307a31574
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: