]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'atompub' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 15 Nov 2010 16:57:19 +0000 (11:57 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 15 Nov 2010 16:57:19 +0000 (11:57 -0500)
commitc1cee3b27ffa1529009195604c5495bef4f83bc2
tree42ae51f86b085978c9f1a28820ec4a69af1589b9
parentfdf3a23da7769586a818ca2219ec6bc1b46587de
parentcb371d65c18771f8fcdcbeb450c063b844c000df
Merge branch 'atompub' into 0.9.x

Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php
EVENTS.txt
actions/apistatusesshow.php
actions/apitimelineuser.php
classes/Notice.php
lib/action.php