Daniel Vincent Grippi c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb config/deploy.rb spec/factories.rb spec/models/request_spec.rb spec/spec_helper.rb		2010-09-14 11:08:18 -07:00
..
controllers	Merge branch 'production' of github.com:diaspora/diaspora into production	2010-09-14 11:08:18 -07:00
helpers	RS, DG; display the correct tab on manage, change edit to manage	2010-09-14 10:05:59 -07:00
models	Merge branch 'production' of github.com:diaspora/diaspora into production	2010-09-14 11:08:18 -07:00
uploaders	added license to every single goddamn file. also, put one in the root dir.	2010-09-13 14:23:50 -07:00
views	DG, RS; Album creation no longer ejects you from context	2010-09-14 11:00:16 -07:00