]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 04af5d9) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 17 Apr 2012 17:17:13 +0000 (13:17 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 17 Apr 2012 17:17:13 +0000 (13:17 -0400)
commitd92bab669331098b1ad7cd435c2fa6582ddab5f0
tree3b78cca8cb5a7e36a2ca597dede1d83ac79ac1f2tree | snapshot
parent04af5d9e2cc7a05c6ea0312643ddc4e8b45846bfcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update to the German string files
  diabook-themes: removed fpostit due to security issues and small fix in german translation
  naked br appearing when attaching and textplain
  Some Bugfixes, and variable checks
  rev update

* master:
Unnamed repository; edit this file 'description' to name the repository.