danielvincent e7d7e1f258 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-20 00:02:22 -07:00
..
controllers	Fixed cucumber features. Backfilled tests for AspectsController#create.	2010-10-19 22:57:55 -07:00
helpers	Beat Dan at bugfixing	2010-10-19 11:43:10 -07:00
models	Remove remove_all_aspects without ill effect	2010-10-19 23:54:12 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.	2010-10-20 00:02:15 -07:00