Raphael 9d48b45ee4 merge conflict line		2010-08-26 16:28:34 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-26 15:02:29 -07:00
helpers	removed ensure_bson in user. added to_id method to String and ObjectID classes	2010-08-25 17:11:57 -07:00
models	merge conflict line	2010-08-26 16:28:34 -07:00
uploaders	made photos for album previews 200x200, small thumbnails now at 50x50	2010-08-26 15:13:33 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-26 15:02:29 -07:00