Raphael Sofaer d5ecce7ca6 Merge branch 'limit_similar_contacts' ... Conflicts: app/controllers/people_controller.rb		2011-04-12 11:48:41 -07:00
..
controllers	Merge branch 'limit_similar_contacts'	2011-04-12 11:48:41 -07:00
helpers	Merge branch 'css-rtl'	2011-04-11 21:52:01 +02:00
mailers	add a plaintext layout for emails, and include a link to change your email settings in the emails	2011-03-22 12:26:38 -07:00
models	Disable typhoeus everywhere but the HTTPMulti specs	2011-04-11 14:52:21 -07:00
uploaders	Make urls not change on processing	2011-03-21 18:42:36 -07:00
views	Merge branch 'limit_similar_contacts'	2011-04-12 11:48:41 -07:00