]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 25 May 2012 14:19:10 +0000 (16:19 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 25 May 2012 14:19:10 +0000 (16:19 +0200)
commita71e3134bf7250b60cafd1e51098eea70c3459de
tree456f59d30e5f4b8d22f4bfdac0c55e7323cd0427
parent8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f
parentd1345e505406b1a1cdc3fc26a1734916c8abc89d
Merge remote branch 'upstream/master'
include/config.php
mod/network.php