zhitomirskiyi 1024b8a3a7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor ... Conflicts: app/controllers/aspects_controller.rb		2010-10-26 14:57:52 -07:00
..
controllers	fixed pagination bug on aspect#show (re: #445)	2010-10-26 12:57:43 -07:00
helpers	OmniauthService -> Service. Cleaned up views.	2010-10-25 17:41:59 -07:00
mailers	update attachment with emails	2010-10-22 17:12:28 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor	2010-10-26 14:57:52 -07:00
uploaders
views	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor	2010-10-26 11:19:50 -07:00