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
This commit is contained in:
@@ -51,7 +51,8 @@ return[
|
||||
"indstillinger" => "Indstillinger",
|
||||
"ændrebillede" => "Skift billede",
|
||||
"ændrer" => "Skift",
|
||||
"profilbillede" => "Upload profil billede"
|
||||
"profilbillede" => "Upload profil billede",
|
||||
"omkring" => "Omkring",
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user