nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
Raphael f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/sprinkle/provision.rb
2010-08-19 16:09:08 -07:00
..
controllers Merge branch 'master' of github.com:diaspora/diaspora into pivots 2010-08-19 16:09:08 -07:00
helpers MS added friend search, and allow for autodiscover 2010-08-19 12:37:34 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora into pivots 2010-08-19 16:09:08 -07:00
uploaders Moving to file store 2010-08-18 16:37:05 -07:00
views added title to search page 2010-08-19 13:41:48 -07:00