Merge branch 'dev' into 'feature/Loginsystem_Loginseite'

Browse Source

# Conflicts:
#   webseite/classes/User.php
#   webseite/users/users.csv

...

This commit is contained in:

Eric Blommel

2024-12-04 21:33:25 +01:00

parent 7b78b4865f 040c04ab3f

commit 1679dd4158

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

Diff Content Not Available