projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 04af5d9)
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)
* 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:


No differences found
Unnamed repository; edit this file 'description' to name the repository.