Merge branch 'master' of https://gitlab.com/kelteseth/ScreenPlay

Browse Source

# Conflicts:
#	crowdin.yml

...

This commit is contained in:

Elias Steurer 2021-09-18 14:05:00 +02:00

parent 4b4951aa4d 93b757e272

commit edac0027cd

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

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