Mike Cochrane 7e38142d4a Resolve conflicts and convert _t( to _( where it was introduced again. ... darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz		2008-07-10 00:51:26 -04:00
..
Avatar.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Confirm_address.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Consumer.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Nonce.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Notice.php	Resolve conflicts and convert _t( to _( where it was introduced again.	2008-07-10 00:51:26 -04:00
Profile.php	Resolve conflicts and convert _t( to _( where it was introduced again.	2008-07-10 00:51:26 -04:00
Queue_item.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Remember_me.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Remote_profile.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Reply.php	Resolve conflicts and convert _t( to _( where it was introduced again.	2008-07-10 00:51:26 -04:00
Sms_carrier.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
stoica.ini	rebuild DB_DataObject classes for new structure	2008-07-09 16:07:11 -04:00
stoica.links.ini	do some commits	2008-06-18 23:32:12 -04:00
Subscription.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
Token.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
User_openid.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00
User.php	Merge conflicts and kill a whole lot of trailing whitespace on lines.	2008-07-09 18:46:30 -04:00