]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:24:15 +0000 (17:24 -0400)
commit93b7e601156d88399b57ef9cd2962a22350270a8
tree14704f5e9f6aa438ce33477a0fee1d96538c5f2f
parent78cec7ab87c005e988dbd8176585ffad9182d25c
parentb5b3690eef0b9223bc5dbfd2a72de165ca8112ad
Merge branch '0.8.x' into 0.9.x

Conflicts:
EVENTS.txt
classes/Notice.php
lib/action.php