diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /languages/messages/MessagesFr.php | |
parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'languages/messages/MessagesFr.php')
-rw-r--r-- | languages/messages/MessagesFr.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php index 034e09c5..b64922ee 100644 --- a/languages/messages/MessagesFr.php +++ b/languages/messages/MessagesFr.php @@ -100,7 +100,6 @@ $specialPageAliases = array( 'PagesWithProp' => array( 'Pages_avec_la_propriété' ), 'PasswordReset' => array( 'Réinitialisation_du_mot_de_passe', 'RéinitialisationDuMotDePasse' ), 'PermanentLink' => array( 'LienPermanent', 'Lien_permanent' ), - 'Preferences' => array( 'Préférences' ), 'Prefixindex' => array( 'Index', 'Préfixes', 'Prefixes' ), 'Protectedpages' => array( 'Pages_protégées', 'PagesProtégées', 'Pages_protegees', 'PagesProtegees' ), |