]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecb67fe b2c6bf0)
Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean
authorMichael Vogel <icarus@dabo.de>
Mon, 30 May 2016 05:24:06 +0000 (07:24 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 30 May 2016 05:24:06 +0000 (07:24 +0200)

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