]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e632810 029633c)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 15 Jun 2014 16:26:59 +0000 (18:26 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 15 Jun 2014 16:26:59 +0000 (18:26 +0200)

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