maxwell 3a8394bd59 Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse		2010-06-21 19:24:07 -07:00
..
controllers	DG IZ; friend and owner now require a real name	2010-06-21 15:56:40 -07:00
helpers	playing	2010-06-18 23:47:42 -07:00
lib	DG MS; require XML root node; added header to XML (not yet required)	2010-06-18 18:03:13 -07:00
models	DG IZ; friend and owner now require a real name	2010-06-21 15:56:40 -07:00
factories.rb	DG IZ; friend and owner now require a real name	2010-06-21 15:56:40 -07:00
misc_spec.rb	added stray local files	2010-06-13 21:22:52 -07:00
spec_helper.rb	fixed the addressable issue; we needed to specify the actuall file the gem gets required as ::sigh::	2010-06-19 14:56:20 -07:00