]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e3b8b3 a3ae3c9)
Merge branch 'develop' of github.com:annando/friendica into 1409-shadow-items
authorMichael Vogel <icarus@dabo.de>
Tue, 18 Nov 2014 23:19:30 +0000 (00:19 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 18 Nov 2014 23:19:30 +0000 (00:19 +0100)

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