ilya 8f55852ea9 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-27 15:30:27 -07:00
..
controllers	Merge branch 'master' of http://github.com/uiri/diaspora	2010-09-27 14:48:11 -07:00
helpers	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
models	removed the encryption key= method, and user with private key factory	2010-09-27 10:10:54 -07:00
uploaders	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
views	Use improved whitespace:scrub_gratuitous_newlines	2010-09-26 12:52:39 -04:00