aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-01-15 18:54:11 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2013-01-15 18:54:11 -0600
commitd59431691c27c73fba8ae9934b84b34a13280dd2 (patch)
tree2d389fda2908ae58c975826cabd017de8014d810 /phpBB/language/en/acp
parenta2f6e494f37914352b0bb72d5a84904d3f2c51a3 (diff)
parent460470229d972b93ef5a98b0d1d97a2a970d684f (diff)
downloadforums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar
forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.gz
forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.bz2
forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.xz
forums-d59431691c27c73fba8ae9934b84b34a13280dd2.zip
Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop
# By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11201: [ticket/11201] Remove database column on update [ticket/11201] Remove MSN/WLM fields
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/styles.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index e7954ff148..3cb2e741ca 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -186,7 +186,6 @@ $lang = array_merge($lang, array(
'IMG_ICON_CONTACT_EMAIL' => 'Send email',
'IMG_ICON_CONTACT_ICQ' => 'ICQ',
'IMG_ICON_CONTACT_JABBER' => 'Jabber',
- 'IMG_ICON_CONTACT_MSNM' => 'WLM',
'IMG_ICON_CONTACT_PM' => 'Send message',
'IMG_ICON_CONTACT_YAHOO' => 'YIM',
'IMG_ICON_CONTACT_WWW' => 'Website',