maxwell 02da9bf634 Merge branch 'master' of github.com:diaspora/diaspora		2010-08-19 12:00:21 -07:00
..
controllers	MS IZ made a reques form in the user index page	2010-08-19 11:59:58 -07:00
helpers	MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page	2010-08-18 22:58:57 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-19 12:00:21 -07:00
uploaders	Moving to file store	2010-08-18 16:37:05 -07:00
views	MS IZ made a reques form in the user index page	2010-08-19 11:59:58 -07:00