Raphael 40957b5370 Merge branch 'master' of github.com:diaspora/diaspora		2010-08-26 15:06:50 -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	Changed parseing person from xml a little, using it for comments.	2010-08-26 15:06:39 -07:00
uploaders	Photo filename is now better	2010-08-23 15:10:19 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-26 15:02:29 -07:00