DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-26 05:01:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources
History
snipe f3526eccb9 Merge branch 'features/textarea-custom-field' into develop 
# Conflicts:
#	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
2018-07-05 12:37:07 -07:00
..
assets Merge branch 'features/textarea-custom-field' into develop 2018-07-05 12:37:07 -07:00
lang
macros Adds textarea as a custom field type 2018-06-21 09:35:04 -07:00
views Merge branch 'features/textarea-custom-field' into develop 2018-07-05 12:37:07 -07:00