snipe 4c5f20fde4 Merge branch 'develop' ...

# Conflicts:
#	app/Importer/Importer.php
#	config/version.php

2018-04-23 13:33:34 -07:00

..

Controllers

Merge branch 'develop'

2018-04-23 13:33:34 -07:00

Middleware

Disable broken tests (#5073)

2018-02-22 21:46:58 -08:00

Requests

Allow setting of "ldap_import" through the API (#5218)

2018-04-20 14:02:52 -07:00

Traits

Putting uniqueUndeleted into a trait for use across models

2016-07-26 01:39:30 -07:00

Transformers

Added count of checkins, checkouts, requests (#5314)

2018-04-06 16:23:39 -07:00

Kernel.php

Comment out the nullable middleware until we have a chance to check all model validators

2017-10-02 16:36:43 -07:00