Changeset [c2d6fd7abb5a38a1553892bbd69113adfe937b62] by Shawn Balestracci
Revision c2d6fd7abb5a38a1553892bbd69113adfe937b62,
committed by Shawn Balestracci
· October 28th, 2010 @ 07:32 PM
Merge branch 'master' into wip
http://github.com/vegantech/sims/commit/c2d6fd7abb5a38a1553892bbd69...
8 changed files
-
A
public/blank.html -
M
app/helpers/application_helper.rb -
M
app/models/district.rb -
M
app/models/right.rb -
M
app/models/role.rb -
M
app/views/districts/bulk_import_form.html.erb -
M
app/views/layouts/application.html.erb -
M
spec/helpers/application_helper_spec.rb