projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8809e96)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 21 Apr 2012 00:16:06 +0000 (20:16 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 21 Apr 2012 00:16:06 +0000 (20:16 -0400)
* remotes/upstream/master:
  diabook-themes: add diabook-dark
  diabook-themes: add diabook-green and some minor css/bug-fixes
  rev update
  escape email template var names. fix bug n385.

* master:


No differences found
Unnamed repository; edit this file 'description' to name the repository.