diff options
| author | AlexVallat <github@alex.vallat.name> | 2015-03-10 18:34:16 +0000 |
|---|---|---|
| committer | AlexVallat <github@alex.vallat.name> | 2015-03-10 18:34:16 +0000 |
| commit | 62c8ffbcc4e75073ad4b73bcc9b2cf523a7c79e4 (patch) | |
| tree | 3b902c207e76909f2b83a1fefcf351ec8d1a9ad4 /src/popup.html | |
| parent | b1f19376e8a7ccf693c394e06d8f3c98311b0b7c (diff) | |
| parent | c4b06eecd2bfde96d2c41b27f9cb8574ea5b09d3 (diff) | |
| download | uBlock-62c8ffbcc4e75073ad4b73bcc9b2cf523a7c79e4.zip uBlock-62c8ffbcc4e75073ad4b73bcc9b2cf523a7c79e4.tar.gz uBlock-62c8ffbcc4e75073ad4b73bcc9b2cf523a7c79e4.tar.bz2 | |
Merge branch 'master' of https://github.com/gorhill/uBlock
Conflicts:
platform/firefox/vapi-background.js
src/_locales/en/messages.json
Diffstat (limited to 'src/popup.html')
| -rw-r--r-- | src/popup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/popup.html b/src/popup.html index 1c468ef..b3bf5af 100644 --- a/src/popup.html +++ b/src/popup.html @@ -6,7 +6,7 @@ <meta charset="utf-8"> <link rel="stylesheet" href="css/common.css" type="text/css"> <link rel="stylesheet" href="css/popup.css" type="text/css"> -<title>µBlock</title> +<title>uBlock</title> </head> <body> |