]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a12603 265e2bd)
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 8 Jun 2009 18:55:32 +0000 (11:55 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 8 Jun 2009 18:55:32 +0000 (11:55 -0700)
commitadfb79a9bbdfb43f35c0f022c1de6118b10ce115
treee14ec0cc5161cfd5cc321eaaa5b8eed07df952detree | snapshot
parent1a126032efbcb265a59f4d682bd072251f857c97commit | diff
parent265e2bd58de2a01e0d7840310eb44b21b70e3914commit | diff
Merge branch '0.7.x' into 0.8.x

Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
README diff1 | diff2 | blob | history
actions/shownotice.php diff1 | diff2 | blob | history
classes/Notice.php diff1 | diff2 | blob | history
classes/Profile.php diff1 | diff2 | blob | history
classes/User.php diff1 | diff2 | blob | history
classes/User_group.php diff1 | diff2 | blob | history
db/notice_source.sql diff1 | diff2 | blob | history
lib/util.php diff1 | diff2 | blob | history
scripts/getvaliddaemons.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. :-)