]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus
authorMichael Vogel <icarus@dabo.de>
Wed, 21 Jan 2015 00:30:09 +0000 (01:30 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 21 Jan 2015 00:30:09 +0000 (01:30 +0100)
commit1f23d691f377cc8c3c2ea444b785d28016f3515b
treefa2f02a6998366f745e40fcb883dac869ea91e3a
parent184dcf75a75f50f02dd9efa1267ee446b4708a80
parented037124b33d1ad405a8d3fb84c1feda4c22ac86
Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus