]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c6bfe6 ac29e83)
Merge branch 'master' into develop
authorfabrixxm <fabrix.xm@gmail.com>
Thu, 6 Nov 2014 19:53:49 +0000 (20:53 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Thu, 6 Nov 2014 19:53:49 +0000 (20:53 +0100)

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