]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8809e96) | patch
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)
commit172aff1c2bb52f07e107bff2abbeea40a12aa5ae
treec6cba9ce7f1cd5b5dd25bda87de4615ab04c7e0atree | snapshot
parent8809e96310048518ffdcc0ffd6a7faed112ab17acommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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:
Unnamed repository; edit this file 'description' to name the repository.