DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources
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
..
assets Merge remote-tracking branch 'origin/master' into develop 2022-05-10 17:26:26 -07:00
lang Added translation string to the correct file this time 2022-05-06 14:07:05 -07:00
macros
views Merge remote-tracking branch 'origin/master' into develop 2022-05-10 17:26:26 -07:00