Skip to content

Commit

Permalink
Merge branch '2' into 3
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 19, 2024
2 parents aebe3f1 + c19e81c commit c3d5726
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"php": "^8.1",
"silverstripe/admin": "^3",
"silverstripe/framework": "^6",
"symfony/http-foundation": "^6.1",
"ua-parser/uap-php": "^3.9.14"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/Models/LoginSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\Security\RememberLoginHash;
use SilverStripe\SessionManager\Security\LogInAuthenticationHandler;
use SilverStripe\Control\Util\IPUtils;
use Symfony\Component\HttpFoundation\IpUtils;

/**
* Tracks a login session for a specific user on a specific device.
Expand Down

0 comments on commit c3d5726

Please sign in to comment.