Changeset [b506702dfde0e8116bc055700381a6a315ef858a] by Shawn Balestracci
Revision b506702dfde0e8116bc055700381a6a315ef858a,
committed by Shawn Balestracci
· May 11th, 2012 @ 07:46 AM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/b506702dfde0e8116bc0557003...
5 changed files
-
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/application_controller.rb -
M
app/models/right.rb -
M
app/views/layouts/_menu.html.erb