Mike Cochrane 98cf96b3e4 Resolve conflict properly ... darcs-hash:20080710045942-533db-209fce2e2e89dfc809c9b25e93fb428c585f29e4.gz		2008-07-10 00:59:42 -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 conflict properly	2008-07-10 00:59:42 -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
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.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
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