maxwell 11925ded2b moving branches

2010-10-14 19:15:32 -07:00

..

controllers

Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion

2010-10-13 23:49:13 -07:00

fixtures

Merge branch 'master' of github.com:diaspora/diaspora into fb

2010-09-27 15:39:50 -07:00

helpers

Add or later to license notice

2010-10-07 16:25:34 -07:00

lib

moving branches

2010-10-14 19:15:32 -07:00

models

merging

2010-10-14 16:32:37 -07:00

factories.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

misc_spec.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

spec_helper.rb

DG MS; filter_post method, aspect_clean method

2010-10-13 13:10:08 -07:00

user_encryption_spec.rb

almost all green

2010-10-12 11:17:29 -07:00