]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 635e922 4b85865)
Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspor...
authorMichael Vogel <icarus@dabo.de>
Sat, 5 Sep 2015 10:13:38 +0000 (12:13 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 5 Sep 2015 10:13:38 +0000 (12:13 +0200)

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