]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - actions/subscriptions.php
Merge remote branch 'gitorious/0.9.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 30 Dec 2010 23:52:08 +0000 (15:52 -0800)
committerEvan Prodromou <evan@status.net>
Thu, 30 Dec 2010 23:52:08 +0000 (15:52 -0800)
commit32eb4c5e2d13ff527494a1ca84e326fcf52cb5cb
tree320ee480e3310459dd121b491d8f22bd5fa64e3c
parente211e6228d7f7742967686005c693697e327e366
parentc91b080a8e001c5940f0d48d1c80e3d10b07873f
Merge remote branch 'gitorious/0.9.x' into 1.0.x

Conflicts:
lib/common.php
EVENTS.txt
classes/Memcached_DataObject.php
classes/Notice.php
classes/Notice_tag.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php