]> git.mxchange.org Git - friendica.git/commit
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)
commit1cd5a3184d70f07e2bd6cdb1668d50e90cf5afac
tree65780dbefeaba6be4e9bd529d00d395e5dccc55b
parent78321c2a43492447dd9336abfb4463bc6fe710ee
parent4312da6326df5bbe8b693ff78e1e7f3f65211930
Merge pull request #1672 from tobiasd/20150614-frank

resolving merge issues with DE doc merging