]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1508-public-relay
authorMichael Vogel <icarus@dabo.de>
Mon, 10 Aug 2015 08:52:54 +0000 (10:52 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 10 Aug 2015 08:52:54 +0000 (10:52 +0200)
commitc8e0685788a26811af63f3127ecff0c9f1712ca4
treec8ad3ec9573cccf2974b034f8b423b6038208caa
parentb24453f8da5c587a13ff0bbe6c71ee1fef84bff5
parentc076c5601628cf87735b8ae0b9f17fe58eb0041d
Merge remote-tracking branch 'upstream/develop' into 1508-public-relay