nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/db
History
Raphael Sofaer 9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
..
migrate Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 2011-07-19 10:44:00 -07:00
seeds rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
schema.rb Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 2011-07-19 10:44:00 -07:00
seeds.rb making the service users badge wider, added a commented out seed step for having some service user data 2011-07-11 16:05:07 -07:00