Raphael 35a4e0aaa1 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-13 15:21:38 -07:00
..
controllers	Add flashes back in to aspect and albums	2010-09-13 15:20:57 -07:00
helpers	added license to every single goddamn file. also, put one in the root dir.	2010-09-13 14:23:50 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 14:49:01 -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-13 15:11:38 -07:00