Raphael 7ce8f94d58 Merge branch 'master' of github.com:diaspora/diaspora		2010-08-18 21:10:48 -07:00
..
controllers	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
helpers	got moved photo.image.stuff to photo.url[:stuff]	2010-08-18 20:59:01 -07:00
models	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
uploaders	Moving to file store	2010-08-18 16:37:05 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-18 21:10:48 -07:00