Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Conflicts: skolehjem/resources/lang/dk/msg.php skolehjem/resources/lang/en/msg.php
2020-08-12 13:10:37 +02:00
parent 4a8b22d6dd 6671cd6aa8
commit e06504b5fb
6 changed files with 33 additions and 2 deletions
@@ -60,5 +60,6 @@ return[
    "indstillinger" => "Settings",
    "ændrebillede" => "Change picture",
    "ændrer" => "Change",
-    "profilbillede" => "Upload profile picture"
+    "profilbillede" => "Upload profile picture",
+    "Omkring" => "About",
 ];