DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources
History
snipe 4419dc7434 Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format 
# Conflicts:
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/LicensesController.php
#	resources/views/hardware/view.blade.php
2016-08-16 18:53:45 -07:00
..
assets Removed console message from JS 2016-08-01 21:43:56 -07:00
lang Fix 2347 (#2394) 2016-08-16 13:02:42 -07:00
macros Added macro for email/username format 2016-06-01 15:44:16 -07:00
views Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format 2016-08-16 18:53:45 -07:00