Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AuthServiceProvider.php #644

Merged
merged 11 commits into from
Aug 7, 2023
Merged

Update AuthServiceProvider.php #644

merged 11 commits into from
Aug 7, 2023

Conversation

Ne-wt
Copy link
Contributor

@Ne-wt Ne-wt commented Jul 13, 2023

this file doesnt exist, we should just comment this out since it floods error logs otherwise

@itinerare itinerare added the needs review Pull requests that are pending community review label Jul 13, 2023
@itinerare itinerare added reviewed Pull requests that have received community review and are pending merge and removed needs review Pull requests that are pending community review labels Jul 14, 2023
@itinerare itinerare changed the base branch from main to develop July 14, 2023 14:20
@itinerare itinerare changed the base branch from develop to main July 14, 2023 14:20
@itinerare itinerare changed the base branch from main to develop July 14, 2023 14:21
itinerare and others added 5 commits August 7, 2023 13:28
Conflicts:
	app/Policies/CommentPolicy.php
	composer.json
	config/lorekeeper/settings.php
	resources/views/admin/reports/report.blade.php
@itinerare
Copy link
Collaborator

Turns out just catching develop up with main was also a good idea...

@itinerare itinerare merged commit 3807609 into corowne:develop Aug 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
reviewed Pull requests that have received community review and are pending merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants