]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 19 Dec 2012 11:24:02 +0000 (12:24 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 19 Dec 2012 11:24:02 +0000 (12:24 +0100)
commitcb3586a2807b98f77fa1cb075ff15d981e473c21
tree4d21d1fff469f68795140da3953118a8e5ce599b
parentc22f65bafa08ea348d55fb1f3c05774b0f320c99
parentac18d7289bf6db086fbdd0f2122379592df23745
Merge remote-tracking branch 'upstream/master'

Conflicts:
view/de/strings.php
view/de/strings.php