Merge remote-tracking branch 'origin/oasis' into oasis

Browse Source

# Conflicts:
#	app/Http/helpers.php

...

This commit is contained in:

Peter Papp

2021-07-09 12:18:17 +02:00

parent c323304f2e 756e0c4ca3

commit 0e4595c30f

5 changed files with 28 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

.php-cs-fixer.cache

File diff suppressed because one or more lines are too long