]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 20 Apr 2012 04:02:18 +0000 (00:02 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 20 Apr 2012 04:02:18 +0000 (00:02 -0400)
commit83683b516ec058d0e5fdd0d4a1defbd22a60c322
treeec970c671a945a6f64543b62ebdd37647abc89d6
parentccdac0cd99edafdae4348709fcd23f446d1aee18
parentc88dd1485f31a129f6e00bf92afee241708e7da9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes

* master: