diaspora

mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00

Files

maxwell d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor

Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb

2010-08-09 17:31:46 -07:00

2010-08-04 20:32:15 -07:00

2010-08-09 14:39:37 -07:00

2010-06-12 21:56:50 -07:00

2010-08-08 21:24:34 -07:00

app_config.yml

2010-08-09 14:27:17 -07:00

application.rb

2010-06-24 17:22:49 -07:00

boot.rb

playing

2010-06-18 23:47:42 -07:00

environment.rb

2010-08-04 20:32:15 -07:00

routes.rb

2010-08-09 17:31:46 -07:00

thin.yml

2010-07-23 10:41:57 -07:00