]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into activityexport
authorEvan Prodromou <evan@status.net>
Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 22 Sep 2010 14:45:34 +0000 (10:45 -0400)
commitb5cfcba4712809cb17eabba299ce5ff04f4d7d70
tree38235bafd6ddf194e484b97321c0c341bea9de38
parent91a186251047127ad7f1238f47ff761d9127627c
parentf0105893b0b78ff88d08cc2417773ad8a44dc2fa
Merge branch '0.9.x' into activityexport

Conflicts:
plugins/OStatus/OStatusPlugin.php
classes/Notice.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php