snipe-it/resources
snipe a0f7fdc57a
Merge branch 'fixes/accessibility_fixes'
# Conflicts:
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
2020-04-08 11:19:42 -07:00
..
assets Merge branch 'fixes/accessibility_fixes' 2020-04-08 11:19:42 -07:00
lang Added/matched forgotten password strings in lang files 2020-03-04 22:07:35 -08:00
macros Added role=“option” to option items, additional icon font fixes 2020-04-02 18:17:21 -07:00
views Merge branch 'fixes/accessibility_fixes' 2020-04-08 11:19:42 -07:00