]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 996224a 98bba66)
Merge pull request #1584 from fabrixxm/develop
authorfabrixxm <fabrix.xm@gmail.com>
Thu, 21 May 2015 06:40:08 +0000 (08:40 +0200)
committerfabrixxm <fabrix.xm@gmail.com>
Thu, 21 May 2015 06:40:08 +0000 (08:40 +0200)
merge "master" back in develop


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