]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 848c099 cd7d29d)
Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
authorMichael Vogel <icarus@dabo.de>
Tue, 27 Jan 2015 09:20:00 +0000 (10:20 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 27 Jan 2015 09:20:00 +0000 (10:20 +0100)

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