ilya 57b61f6827 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-05 13:00:54 -07:00
..
controllers	more querying through the current_user in controllers	2010-10-05 12:41:41 -07:00
helpers	added a warning, moved connected as into a partial, removed the	2010-09-27 16:31:19 -07:00
models	not encrypting the entire thing	2010-10-03 17:39:16 -07:00
uploaders	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
views	Fb friends are displayed only once	2010-10-05 13:00:42 -07:00