Raphael Sofaer ddd4424df8 Merge remote branch 'manuels/842-sortable-aspects' ... Conflicts: app/models/user.rb db/schema.rb		2011-07-28 14:36:41 -07:00
..
migrate	Merge remote branch 'manuels/842-sortable-aspects'	2011-07-28 14:36:41 -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 'manuels/842-sortable-aspects'	2011-07-28 14:36:41 -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