]> git.mxchange.org Git - friendica.git/commitdiff
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)
1  2 
include/config.php
mod/network.php

Simple merge
diff --cc mod/network.php
Simple merge