]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4972d7e 975781d)
Merge pull request #131 from simonlnu/master
authorSimon <simon@kisikew.org>
Wed, 14 Mar 2012 05:10:02 +0000 (22:10 -0700)
committerSimon <simon@kisikew.org>
Wed, 14 Mar 2012 05:10:02 +0000 (22:10 -0700)
massive work done to both dispys, mostly -dark


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