aboutsummaryrefslogtreecommitdiff
path: root/manifest.json
diff options
context:
space:
mode:
authorEric Guzman2012-04-02 15:36:08 -0700
committerEric Guzman2012-04-02 15:36:08 -0700
commit0241bf331b7e06e206a54be441edf2f4c7261f63 (patch)
treeb7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /manifest.json
parentdde5b5054f93db493e5d4d502e677f5781334b08 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'manifest.json')
-rw-r--r--manifest.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json
index 80d8a5be..50e1cba1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,8 @@
14 "unlimitedStorage", 14 "unlimitedStorage",
15 "notifications", 15 "notifications",
16 "webRequest", 16 "webRequest",
17 "webRequestBlocking" 17 "webRequestBlocking",
18 "http://www.google.com/*"
18 ], 19 ],
19 "requirements": { 20 "requirements": {
20 "3D": { 21 "3D": {