diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:39:53 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:39:53 +0100 |
| commit | 603c1a1e6dfa9f1bc6759843283a8a7995c613f8 (patch) | |
| tree | 61349b0905bf69e2370f150d6e32901bad1aa25f /lib/plugins/usermanager/lang/en | |
| parent | b35d34217e073f330111fea5812fa4d88680a4ef (diff) | |
| parent | 4b142187c1238555a14d79ff6e054a678ce828f3 (diff) | |
| download | rpg-603c1a1e6dfa9f1bc6759843283a8a7995c613f8.tar.gz rpg-603c1a1e6dfa9f1bc6759843283a8a7995c613f8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into FS#2124deniedtext
Conflicts:
inc/lang/bn/lang.php
inc/lang/fr/denied.txt
Diffstat (limited to 'lib/plugins/usermanager/lang/en')
| -rw-r--r-- | lib/plugins/usermanager/lang/en/lang.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index f87c77afb..b55ecc998 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -76,4 +76,3 @@ $lang['import_error_create'] = 'Unable to create the user'; $lang['import_notify_fail'] = 'Notification message could not be sent for imported user, %s with email %s.'; $lang['import_downloadfailures'] = 'Download Failures as CSV for correction'; - |