ilya 992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/models/aspect_spec.rb		2010-10-20 11:30:06 -07:00
..
controllers	Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.	2010-10-20 11:03:47 -07:00
helpers	Beat Dan at bugfixing	2010-10-19 11:43:10 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 11:30:06 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00