Revert "Revert "merge 1""

This reverts commit 0c463d1f10.
2022-10-24 01:04:22 +01:00
parent 0c463d1f10
commit b89d71b371
166 changed files with 4250 additions and 1833 deletions
--- a/app/Ban.php
+++ b/app/Ban.php
@@ -36,7 +36,7 @@ class Ban extends Model
    ];

    public $dates = [
-        'suspendedUntil',
+        'bannedUntil',
    ];

    public function user()