]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 522008d eb667d0)
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 27 Aug 2009 21:52:32 +0000 (14:52 -0700)
committerEvan Prodromou <evan@status.net>
Thu, 27 Aug 2009 21:52:32 +0000 (14:52 -0700)
commita08c76a4342cfb4b3d772f6880ba0b8f3153b246
treee2ba9ef2f670d01cf700a732d36050fe3ce63774tree | snapshot
parent522008dee570aafcc844bf123d25203c7d9c3ebccommit | diff
parenteb667d09d9c6ef5a1465a5f8d824661a9387a4dacommit | diff
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x

Conflicts:
classes/laconica.ini
13 files changed:
README diff1 | diff2 | blob | history
classes/File.php diff1 | diff2 | blob | history
classes/File_oembed.php diff1 | diff2 | blob | history
classes/Notice.php diff1 | diff2 | blob | history
db/statusnet.sql diff1 | | blob | history
db/statusnet_pg.sql diff1 | | blob | history
install.php diff1 | diff2 | blob | history
js/userdesign.go.js diff1 | diff2 | blob | history
lib/facebookaction.php diff1 | diff2 | blob | history
lib/facebookutil.php diff1 | diff2 | blob | history
lib/rssaction.php diff1 | diff2 | blob | history
lib/twitterapi.php diff1 | diff2 | blob | history
tests/HashTagDetectionTests.php | 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. :-)