Dan Hansen 3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ... Conflicts: app/views/status_messages/bookmarklet.html.haml config/assets.yml db/schema.rb public/javascripts/contact-edit.js public/javascripts/publisher.js public/javascripts/view.js		2011-08-20 14:40:56 -05:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged	2011-08-20 14:40:56 -05:00
helpers	combine invitation emails	2011-08-19 12:15:11 -07:00
mailers	really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects	2011-08-19 15:57:10 -07:00
models	wip	2011-08-19 15:56:31 -07:00
uploaders	Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of ="	2011-08-18 12:06:04 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged	2011-08-20 14:40:56 -05:00