Fixed wording ...

Co-authored-by: Christian Mäder <[email protected]>

Fixed version conflicts for social-auth-core

Merge pull request #980 from netbox-community/renovate/psycopg2-2.x ...

Update dependency psycopg2 to v2.9.6

Update dependency psycopg2 to v2.9.6

Merge pull request #976 from tobiasge/better-tests ...

Further improved test configuration

Further improved test configuration

Preparation for 2.5.2

Merge branch 'release' into develop

Merge pull request #973 from tobiasge/social-auth-update ...

Use same version as Netbox for social-auth-core

Merge pull request #972 from netbox-community/renovate/django-auth-ldap-4.x ...

Update dependency django-auth-ldap to v4.2.0

Use same version as Netbox for social-auth-core

Update dependency django-auth-ldap to v4.2.0

Merge pull request #968 from ryanmerolle/patch-1 ...

Update docker-compose.yml

Update docker-compose.yml

Added more tests (#965)

Merge pull request #963 from netbox-community/develop ...

Version 2.5.1

Merge pull request #964 from tobiasge/better-base-image-check ...

Simplified base image check

Simplified basse image check

Preparation for 2.5.1

Merge pull request #961 from MarcHagen/patch-1 ...

Catch DoesNotExist preventing startup

Catch DoesNotExist preventing startup ...

Fixes failing startup because of python error:

```
Traceback (most recent call last):
  File "/opt/netbox/netbox/./manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/core/management/__init__.py", line 446, in execute_from_command_line
    utility.execute()
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/core/management/__init__.py", line 440, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/core/management/base.py", line 402, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/core/management/base.py", line 448, in execute
    output = self.handle(*args, **options)
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/core/management/commands/shell.py", line 127, in handle
    exec(sys.stdin.read(), globals())
  File "<string>", line 2, in <module>
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/db/models/manager.py", line 85, in manager_method
    return getattr(self.get_queryset(), name)(*args, **kwargs)
  File "/opt/netbox/venv/lib/python3.10/site-packages/django/db/models/query.py", line 650, in get
    raise self.model.DoesNotExist(
users.models.Token.DoesNotExist: Token matching query does not exist.
```

Merge pull request #959 from netbox-community/develop ...

Version 2.5.0

Preparation for 2.5.0

Merge pull request #955 from tobiasge/953-default-admin ...

Don't create superuser with default credentials

Merge pull request #958 from tobiasge/954-use-skopeo ...

Added check for commands to all scripts

Added check for commands to all scripts

Don't create superuser with default credentials

Merge pull request #957 from tobiasge/fix-action-badge ...

Fixed Github action badge

Merge pull request #956 from tobiasge/954-use-skopeo ...

Replaced curl with Skopeo for in image functions

Fixed Github action badge