]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78321c2 4312da6)
Merge pull request #1672 from tobiasd/20150614-frank
authorfabrixxm <fabrix.xm@gmail.com>
Mon, 15 Jun 2015 12:00:18 +0000 (14:00 +0200)
committerfabrixxm <fabrix.xm@gmail.com>
Mon, 15 Jun 2015 12:00:18 +0000 (14:00 +0200)
resolving merge issues with DE doc merging


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