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

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