]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - doc-src/about
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2851296 d32fb7c)
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 3 Jan 2010 05:47:34 +0000 (19:47 -1000)
committerEvan Prodromou <evan@status.net>
Sun, 3 Jan 2010 05:47:34 +0000 (19:47 -1000)
commit90a2563a90e1bf2239d177a564bbe3e838d93dc4
tree47a19a1a564dc0934f0e04d46af3b6f0db30cc1dtree | snapshot
parent2851296c8df7ad8fb9394d9d087ce04867e30d92commit | diff
parentd32fb7c7c40e3d5fa67496d5df0574fc9c2e0151commit | diff
Merge branch 'master' into 0.9.x

Conflicts:
classes/Memcached_DataObject.php
classes/Memcached_DataObject.php diff1 | diff2 | blob | history
classes/Notice.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. :-)