]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into develop
authorJens Tautenhahn <shogun@tausys.de>
Mon, 14 Nov 2016 08:52:01 +0000 (09:52 +0100)
committerJens Tautenhahn <shogun@tausys.de>
Mon, 14 Nov 2016 08:52:01 +0000 (09:52 +0100)
commit31ad26aae2856fdf7921c53abb8ae525792a05d4
treeab3f97fb158c7ee9c43cc7cb380b8531de203e4e
parentd92c9a444f42dc5bc74ca4f827369ae5a6257cf7
parent717997b14ff3bbd7423bfc22beb99ba0b83d9b4f
Merge remote-tracking branch 'upstream/develop' into develop