projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 665ad7e 5915325)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 11 Mar 2012 06:24:59 +0000 (01:24 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 11 Mar 2012 06:24:59 +0000 (01:24 -0500)
* remotes/upstream/master:
  bug #328
  default the text template var on conversations
  bug #327 - composed private message is lost if no recip specified.
  revup
  fixed login-fields, fixed. notofication.png, changed locations
  German translation

* master:


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