Merge branch '848-parametres-masquer-loption-nom-daffichage' into dev…

…elop # Conflicts: # changelog.d/848.change
tchapgouv · Jun 28, 2023 · 056f5db · 056f5db
2 parents ef6db5b + d34f3a2
commit 056f5db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
@@ -378,7 +378,7 @@ - (void)updateSections
     [sectionUserSettings addRowWithTag:USER_SETTINGS_PROFILE_PICTURE_INDEX];
 
     // Tchap: Remove Display Name because the function is blocked by back-end
-        [sectionUserSettings addRowWithTag:USER_SETTINGS_DISPLAYNAME_INDEX];
+    //    [sectionUserSettings addRowWithTag:USER_SETTINGS_DISPLAYNAME_INDEX];
 
     if (RiotSettings.shared.settingsScreenShowChangePassword)
     {

diff --git a/changelog.d/848.change b/changelog.d/848.change
@@ -0,0 +1 @@
+[Param竪tres] Masquer l'option "Nom d'affichage" réellement :-) (#848)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[Param竪tres] Masquer l'option "Nom d'affichage" réellement :-) (#848)