danielvincent c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/models/post.rb		2010-07-17 19:00:53 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-17 19:00:53 -07:00
helpers	MS kinda hacky webfinger email fix	2010-07-16 23:03:59 -07:00
models	callbacks not running on photo save	2010-07-17 14:09:21 -07:00
uploaders	Added photos, profile editing	2010-07-16 17:26:06 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-17 19:00:53 -07:00