]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fca8aec 207b6f3)
Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name
authorMichael Vogel <icarus@dabo.de>
Thu, 16 Jul 2015 08:18:07 +0000 (10:18 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 16 Jul 2015 08:18:07 +0000 (10:18 +0200)

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