]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 297d8a6 7aaf22a)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 19 Jun 2014 21:01:33 +0000 (23:01 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 19 Jun 2014 21:01:33 +0000 (23:01 +0200)

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