]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81395fe 6e354ec)
Merge remote-tracking branch 'upstream/develop' into 1606-time-travel
authorMichael Vogel <icarus@dabo.de>
Mon, 13 Jun 2016 20:32:40 +0000 (22:32 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 13 Jun 2016 20:32:40 +0000 (22:32 +0200)

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