]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: beaca70 e03a5ec)
Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus
authorMichael Vogel <icarus@dabo.de>
Mon, 12 Jan 2015 19:49:00 +0000 (20:49 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 12 Jan 2015 19:49:00 +0000 (20:49 +0100)

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