]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94fb030 418ac91)
Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location
authorMichael Vogel <icarus@dabo.de>
Sat, 10 Jan 2015 23:51:14 +0000 (00:51 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 10 Jan 2015 23:51:14 +0000 (00:51 +0100)

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