ilya 4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites ... Conflicts: Gemfile Gemfile.lock		2010-10-07 18:20:51 -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	Add or later to license notice	2010-10-07 16:25:34 -07:00
person.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
photo.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
post.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
profile.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
request.rb	Add or later to license notice	2010-10-07 16:25:34 -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 invites	2010-10-07 18:20:51 -07:00