Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source

* 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:

...

This commit is contained in:

Simon L'nu 2012-04-20 20:16:06 -04:00

parent 8809e96310

commit 172aff1c2b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available