]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 539a93b e955f01)
Merge remote-tracking branch 'upstream/develop' into 1504-parse_url
authorMichael Vogel <icarus@dabo.de>
Thu, 9 Apr 2015 17:49:33 +0000 (19:49 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 9 Apr 2015 17:49:33 +0000 (19:49 +0200)

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