snipe 3e222b674a Merge branch 'develop' ... # Conflicts: # resources/views/hardware/view.blade.php		2017-09-22 17:04:43 -07:00
..
assets	Custom field import repair (#3968)	2017-09-18 12:29:08 -07:00
lang	Merge branch 'develop'	2017-09-22 16:12:18 -07:00
macros	Added new languages, commented out ones with 0% translated	2017-09-06 17:51:11 -07:00
views	Merge branch 'develop'	2017-09-22 17:04:43 -07:00