Raphael Sofaer d5ecce7ca6 Merge branch 'limit_similar_contacts' ... Conflicts: app/controllers/people_controller.rb		2011-04-12 11:48:41 -07:00
..
blueprint	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
sass	Merge branch 'limit_similar_contacts'	2011-04-12 11:48:41 -07:00
vendor	bunch of small mobile ui fixes	2011-03-31 23:38:38 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00