]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 27 Mar 2012 07:23:50 +0000 (03:23 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 27 Mar 2012 07:23:50 +0000 (03:23 -0400)
commita57e1e9cbcb492df05580e8cc492fe757f8df73b
tree530e49fd6e68152f5a0fc1c0eded3d3491363ccf
parentcfdb2979cb5caac7806d993f63844c1314e2cdfa
parente7bc3f2bd0f578d04c271029d869e1fbc36cbec4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add "find friends" to right_aside to diabook, fixes in css in diabook
  fixed Umlaute in de strings.php

* master: