maxwell 341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell ... Conflicts: Gemfile Gemfile.lock spec/models/user/invite_spec.rb		2010-10-14 23:02:06 -07:00
..
album.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
aspect.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
comment.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
fb_status.rb	killed the public tab. made a broadcast button in everyone tab	2010-10-08 14:06:49 -07:00
person.rb	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
photo.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
post.rb	posts now serialize their created_at time	2010-10-14 16:49:08 -07:00
profile.rb	stop the file include madness. using File.join and Rails.root for includes everywhere I could	2010-10-10 11:54:08 -07:00
request.rb	requests are made on invite but perhaps they should be made on signup so that we have a person	2010-10-14 18:12:18 -07:00
retraction.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
status_message.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
user.rb	Merge branch 'master' of github.com:diaspora/diaspora into maxwell	2010-10-14 23:02:06 -07:00