Will Bradley accec4edb1 Merge branch 'csv' ...

Conflicts:
	app/models/user_certification.rb
	app/views/user_certifications/index.html.erb
	app/views/user_certifications/show.html.erb

2013-08-28 08:21:28 -07:00

..

_form.html.erb

Adding quick-add buttons to user profiles

2013-08-26 23:01:43 -07:00

edit.html.erb

Fine tuned abilities and updated how membership is tracked

2013-01-25 06:01:02 -07:00

index.html.erb

Updating icons, fixing user cert nil error

2013-08-26 22:05:53 -07:00

new.html.erb

Fine tuned abilities and updated how membership is tracked

2013-01-25 06:01:02 -07:00

show.html.erb

Merge branch 'csv'

2013-08-28 08:21:28 -07:00