]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'master' into master 2616/head
authorDan Brown <redacted>
Sun, 7 Mar 2021 17:19:55 +0000 (17:19 +0000)
committerGitHub <redacted>
Sun, 7 Mar 2021 17:19:55 +0000 (17:19 +0000)
1  2 
resources/lang/de/settings.php

Simple merge