]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
authorMichael Vogel <icarus@dabo.de>
Tue, 22 Dec 2015 10:25:37 +0000 (11:25 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 22 Dec 2015 10:25:37 +0000 (11:25 +0100)
commit307beb47fd4930c665cb7d3032ca4405900af43d
treebc4b0b2614f0b3a27070775f38f8cced508a5a02
parent7ee1eb2978b7e20fabe4a8865e44e96942f55598
parent71255d04a2cd075402743260ffc51637b7704db5
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment

Conflicts:
include/ostatus.php
boot.php
include/auth.php
include/delivery.php
include/ostatus.php
include/session.php