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

Browse Source

# Conflicts:
#	.php_cs.cache

...

This commit is contained in:

Peter Papp

2021-05-04 16:40:27 +02:00

parent 7cc27938bf cc4f9c0b89

commit c65414f0c4

1 changed files with 1 additions and 1 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

.php_cs.cache

+1 -1

File diff suppressed because one or more lines are too long