snipe-it/resources
snipe f99602c039 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
2021-08-18 00:47:33 -07:00
..
assets Fixed border radius for bulk checkout field [ch16936] 2021-08-18 00:44:55 -07:00
lang initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358] 2021-08-10 18:26:43 -07:00
macros Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] 2021-08-17 21:59:33 -07:00
views Merge remote-tracking branch 'origin/develop' 2021-08-18 00:47:33 -07:00