]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15f6309 9168483)
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 10 Jul 2009 17:03:57 +0000 (10:03 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 10 Jul 2009 17:03:57 +0000 (10:03 -0700)
commitbafa1ab1c532118e2230df50ed18a1b4573692b7
treea11a35affda3f2a1d74cfe450a5ceaa230af2ca5tree | snapshot
parent15f6309deacf64e6b408d45a4eb19852d36f9f72commit | diff
parent91684830e55dd0e6a9e069ff140e17a929dd2364commit | diff
Merge branch '0.7.x' into 0.8.x

Conflicts:
README
actions/twitapiusers.php
README diff1 | diff2 | blob | history
actions/twitapiusers.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. :-)