]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccdac0c c88dd14)
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)
* remotes/upstream/master:
  diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.