snipe b29d7beb3a Merge branch 'develop' ... # Conflicts: # .gitignore # Dockerfile # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/AssetsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/GroupsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/UsersController.php # app/Http/routes.php # app/Models/Depreciation.php # app/Models/Location.php # config/version.php # resources/views/account/view-assets.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/modals.blade.php # resources/views/reports/custom.blade.php # snipeit.sh		2017-09-22 16:12:18 -07:00
..
admin	Merge branch 'develop'	2017-09-22 16:12:18 -07:00
auth	Updated language strings	2017-07-07 13:14:51 -07:00
button.php	Update user(view) for support multilanguage (#3383)	2017-03-10 16:58:29 -08:00
general.php	Bulk asset audit form (needs more testing)	2017-08-29 16:00:22 -07:00
mail.php	Updated translations	2016-12-03 17:10:05 -08:00
pagination.php
passwords.php
reminders.php
table.php
validation.php	Updated translations	2017-09-06 18:05:32 -07:00