Daniel Vincent Grippi 3a468a9f1b Merge branch 'master' of github.com:diaspora/diaspora into production		2010-09-14 11:45:33 -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 'master' of github.com:diaspora/diaspora into production	2010-09-14 11:45:33 -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	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-14 11:43:03 -07:00