]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
lib/rssaction.php
lib/twitterapi.php

1  2 
index.php patch | diff1 | diff2 | blob | history

diff --cc index.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)