]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a61b07 a0f6b4f)
Merge branch 'master' into testing
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 24 Aug 2009 15:28:16 +0000 (11:28 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 24 Aug 2009 15:28:16 +0000 (11:28 -0400)
commit77f303c2be138aee34955e2a737bd9cb31caa2d4
tree5d05446a8e16bdec79ba245adaeb326b268f2378tree | snapshot
parent7a61b0737d00adbdaaea7e82fa3a1702286332aacommit | diff
parenta0f6b4f078252389eacf53dce1c5ca10951c76accommit | diff
Merge branch 'master' into testing

Conflicts:
lib/rssaction.php
lib/twitterapi.php
index.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. :-)