ilya 992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/models/aspect_spec.rb		2010-10-20 11:30:06 -07:00
..
user	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 11:30:06 -07:00
exporter.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
importer.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
ostatus_builder.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
parser.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
user.rb	Move user module requires out to the user modules definition file	2010-10-13 11:18:06 -07:00
webhooks.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
websocket.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00