maxwell e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import ... Conflicts: app/controllers/users_controller.rb		2010-10-13 23:09:48 -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	Return everyone on an empty search	2010-10-12 18:18:03 -07:00
photo.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
post.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
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	stop the file include madness. using File.join and Rails.root for includes everywhere I could	2010-10-10 11:54:08 -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 import	2010-10-13 23:09:48 -07:00