danielgrippi 775e7b6b2b Merge branch 'master' into follow ... Conflicts: features/step_definitions/user_steps.rb		2011-05-17 11:33:35 -07:00
..
controllers	Merge branch 'master' into follow	2011-05-17 11:33:35 -07:00
helpers	made dropdown selectors sexi	2011-05-16 16:29:13 -07:00
mailers	Merge branch 'master' into follow	2011-05-12 15:49:51 -07:00
models	Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated.	2011-05-17 10:33:33 -07:00
uploaders	Make urls not change on processing	2011-03-21 18:42:36 -07:00
views	Merge branch 'master' into follow	2011-05-17 11:33:35 -07:00