]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
authorMichael Vogel <icarus@dabo.de>
Thu, 26 Nov 2015 10:46:58 +0000 (11:46 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 26 Nov 2015 10:46:58 +0000 (11:46 +0100)
commitfc250bbc2041b7571e126ec56974221f3c2f789b
treea7309ec22f5fce6e79542f7b748416d0a780ac89
parent6b5ea74bbdd6de24108ee0321b96cd1c049448ea
parente146b42d156fbe68b22b7799bd0d7a462ab89d64
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
include/ostatus.php