diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
| commit | c6fd65ef7639cd67487c831db10dd79e4510efa6 (patch) | |
| tree | 2c825413c26df7d0c5394d01c2599003cab87c0b /app/i18n/ru/conf.php | |
| parent | 93f7f849874dcdf1263370ff08c72a962f8de56f (diff) | |
| parent | 17c3e616e8c3b927ee46258a8b8b20371bf59592 (diff) | |
Resolve git conflict
Diffstat (limited to 'app/i18n/ru/conf.php')
| -rw-r--r-- | app/i18n/ru/conf.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index e502e9a43..557fbe369 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -76,7 +76,6 @@ return array( '_' => 'Account deletion', 'warn' => 'Your account and all the related data will be deleted.', ), - 'email_persona' => 'Login email address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>', 'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>', 'password_form' => 'Password<br /><small>(for the Web-form login method)</small>', 'password_format' => 'At least 7 characters', |