]> 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: 053b8c6 b052780)
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 1 Jan 2010 21:20:25 +0000 (11:20 -1000)
committerEvan Prodromou <evan@status.net>
Fri, 1 Jan 2010 21:20:25 +0000 (11:20 -1000)
Conflicts:
classes/Memcached_DataObject.php

1  2 
classes/Memcached_DataObject.php patch | diff1 | diff2 | blob | history

diff --cc classes/Memcached_DataObject.php
Simple 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. :-)