Will Bradley
d3b8ad7222
Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| database.yml | ||
| environment.rb | ||
| routes.rb | ||