# Conflicts: # .gitignore # app/controllers/admin/AccessoriesController.php # app/controllers/admin/AssetsController.php # app/controllers/admin/LicensesController.php # app/models/Accessory.php # app/models/Asset.php # app/routes.php # app/views/backend/accessories/index.blade.php # app/views/backend/accessories/view.blade.php # app/views/backend/hardware/index.blade.php # app/views/backend/licenses/index.blade.php
TODO: - Add checkout to location - Drop Checkin (doesn't really exist in this context) - Add missing strings - consolidate where possible. Lots of dupes :-/