Ian Denhardt e36399974e Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline ... Conflicts: lib/action.php plugins/OStatus/actions/ostatusinit.php		2010-12-20 15:19:33 -05:00
..
groupsalmon.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
ostatusgroup.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
ostatusinit.php	Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline	2010-12-20 15:19:33 -05:00
ostatussub.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
ownerxrd.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
pushcallback.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
pushhub.php	Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P	2010-10-08 10:42:59 -07:00
usersalmon.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00