Commit Graph

3 Commits

Author SHA1 Message Date
Andrew Brown
51a5a4f17a Merge branch 'scaffolds'
Conflicts:
	app/controllers/users_controller.rb
	test/functional/users_controller_test.rb
2012-12-23 22:37:49 -06:00
Andrew Brown
69110c64e9 users scaffold 2012-12-22 20:24:25 -06:00
Andrew Brown
9b97f9f556 deleted controller/model 2012-12-22 19:59:05 -06:00