]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 29 Apr 2012 00:16:25 +0000 (20:16 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 29 Apr 2012 00:16:25 +0000 (20:16 -0400)
commitecd1dab373a1fccb1663023f6515ed148475079d
tree144978a5312ec9d81cd43fbf74a99fd4789922fb
parent9413900a9f9cb3c455ee4f0300224dec3a4a9f75
parent8a112aee0012383c5328021a5b0637957439cbaa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled

* master: