]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74b237d 1b6c84d)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 18 Apr 2012 04:24:33 +0000 (00:24 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 18 Apr 2012 04:24:33 +0000 (00:24 -0400)
* remotes/upstream/master:
  diabook-themes: some css/bug-fixes
  messages.po/strings.php at 100% Esperanto
  Typo

* master:


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