snipe 1394424760 Merge branch 'hotfixes/customfields_in_asset_report' into develop ... # Conflicts: # resources/views/models/custom_fields_form.blade.php		2016-09-28 19:28:55 -07:00
..
Controllers	Merge branch 'hotfixes/customfields_in_asset_report' into develop	2016-09-28 19:28:55 -07:00
Middleware	Allow X-Frame-Options to be disabled via env if necessary	2016-08-29 22:57:29 -07:00
Requests	Remove last name requirement in save user request	2016-08-30 06:47:38 -07:00
Traits	Putting uniqueUndeleted into a trait for use across models	2016-07-26 01:39:30 -07:00
Kernel.php	Use custom maintenance middleware	2016-08-11 19:22:26 -07:00
routes.php	Added Ajax reporting view	2016-09-19 23:52:01 -07:00