Raphael 09c6af28a4 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-11 11:09:35 -07:00
..
controllers	Make intended behavior on hcard action clearer, return 404 on nonexistent person	2010-10-11 10:13:52 -07:00
helpers	don't translate css class to mark request count	2010-10-08 14:46:57 -07:00
models	Pull in search improvement, remove cruft	2010-10-11 11:08:54 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	DG MS; added tooltip	2010-10-11 10:53:00 -07:00