Merge branch 'v4-next' into notifications

This commit is contained in:
Andras Bacsai
2023-06-01 08:22:07 +02:00
204 changed files with 5744 additions and 2545 deletions

View File

@@ -2,11 +2,12 @@
<div>
<h3>Current Team</h3>
<p>Name: {{ session('currentTeam.name') }}</p>
<livewire:switch-team/>
<livewire:switch-team />
<div class="h-12"></div>
<h3>Notifications</h3>
<livewire:notifications.discord-settings :model="session('currentTeam')" />
<livewire:notifications.email-settings :model="session('currentTeam')" />
<div class="h-12"></div>
</div>
<livewire:switch-team>
</x-layout>