snipe 8ccc1c6515 Fixed weird merge in Bulk Users Controller ... Signed-off-by: snipe <snipe@snipe.net>		2020-05-27 22:46:42 -07:00
..
Controllers	Fixed weird merge in Bulk Users Controller	2020-05-27 22:46:42 -07:00
Middleware	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07:00
Requests	Remove/Reorganize logic to make codacy happier.	2020-05-23 15:24:10 -04:00
Traits	Added: Caching of settings (#6378)	2018-11-01 19:59:50 -07:00
Transformers	Remove/Reorganize logic to make codacy happier.	2020-05-23 15:24:10 -04:00
Kernel.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00