]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 042c61e 4007312)
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 13 Mar 2009 21:54:03 +0000 (22:54 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 13 Mar 2009 21:54:03 +0000 (22:54 +0100)
Conflicts:
plugins/PiwikAnalyticsPlugin.php


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)