]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 22 Apr 2012 16:27:59 +0000 (12:27 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 22 Apr 2012 16:27:59 +0000 (12:27 -0400)
commit75c228fa13d814c772db4e072dfc615eed29d206
treef4345a3e24b5f1f959b918a75220b290d6bd52a6
parent9434b447f3302a7f3223fb01f3c71378b8764e92
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings update
  diabook-themes: comment-bbcode-bugfix

* master: