]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a5a964 1b64aad)
Merge remote-tracking branch 'upstream/develop' into 1603-scrape-alias
authorMichael Vogel <icarus@dabo.de>
Wed, 30 Mar 2016 10:47:48 +0000 (12:47 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 30 Mar 2016 10:47:48 +0000 (12:47 +0200)

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