]> git.mxchange.org Git - friendica.git/commit
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)
commitdfdf0f13357d9e8a66d10da9e0f8506a010e2ab2
tree0431b729c1a7b75c27dda6d887e66e9d6b4a1de1
parent665ad7e6600778c446aa9c5fc48ed32b309e64a7
parent5915325367013f96ffdabb7ef5ca56aa652ccd8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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: