]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 184dcf7 ed03712)
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)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.