]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'activityhooks' into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:01:18 +0000 (16:01 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:01:18 +0000 (16:01 -0700)
Conflicts:
classes/Notice.php

1  2 
classes/Notice.php
classes/Profile.php
plugins/OStatus/OStatusPlugin.php

Simple merge
Simple merge
Simple merge