]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ada009 0e6f3e6)
Merge remote branch 'upstream/develop' into mat/pullrequest5
authorMatthew Exon <github.mexon@spamgourmet.com>
Mon, 25 Jan 2016 09:58:18 +0000 (10:58 +0100)
committerMatthew Exon <github.mexon@spamgourmet.com>
Mon, 25 Jan 2016 09:58:18 +0000 (10:58 +0100)

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