snipe ef1eb15a91 Merge remote-tracking branch 'origin/master' into develop ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/permissions.php

2022-05-12 09:31:42 -07:00

..

Console

Removed dupe lines from merge conflict

2022-05-03 12:56:29 -07:00

Events

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

Exceptions

Merge remote-tracking branch 'origin/master' into develop

2022-03-03 21:59:38 -08:00

Helpers

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00

Http

Merge remote-tracking branch 'origin/master' into develop

2022-05-12 09:31:42 -07:00

Importer

Merge master back down into develop

2022-03-29 16:28:43 +01:00

Jobs

Version 3 - hold onto your butts

2016-03-25 01:18:05 -07:00

LegacyEncrypter

Minor code cleanup bits and bobs (#6805)

2019-03-13 20:12:03 -07:00

Listeners

adds table structure for asset history

2022-03-14 19:38:36 -07:00

Models

adds validation for all purchase costs variables

2022-05-10 16:26:06 -07:00

Notifications

Fixed notification tests

2021-12-02 20:01:03 -08:00

Observers

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00

Policies

Merge remote-tracking branch 'origin/master' into develop

2022-05-12 09:31:42 -07:00

Presenters

Merge remote-tracking branch 'origin/master' into develop

2022-05-10 17:26:26 -07:00

Providers

SCIM integration using the 're-do-the routes' approach, which seems like a dead-end

2022-04-05 20:26:37 +01:00

Services

Merge remote-tracking branch 'origin/master' into develop

2022-05-10 17:26:26 -07:00