DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources/views/users
History
snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
..
bulk-edit.blade.php Use the same string for both radio buttons in bulk user edit 2022-03-29 16:45:55 +01:00
confirm-bulk-delete.blade.php Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
edit.blade.php Add remote option to user 2022-03-04 05:35:26 -08:00
index.blade.php Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
ldap.blade.php Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
print.blade.php Merge remote-tracking branch 'origin/master' into develop 2022-05-10 17:26:26 -07:00
view.blade.php Remove conflicting toolbar call in model listing 2022-05-06 05:15:58 -07:00