]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita9d835920824c48caef2a66686d6605ff54586b3
treee8c9e297d46d36a5e3a3b3d47bbd51865e6123bftree | snapshot
parent053b8c600d7db73ec19e5f1d3e26c4c98fdf3d8ccommit | diff
parentb0527801d9c2b84408bbfdf82bbdc5b778f72cfccommit | diff
Merge branch 'master' into 0.9.x

Conflicts:
classes/Memcached_DataObject.php
classes/Memcached_DataObject.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)