aboutsummaryrefslogtreecommitdiff
path: root/manifest.json
diff options
context:
space:
mode:
authorJonathan Duran2012-03-29 07:27:27 -0700
committerJonathan Duran2012-03-29 07:27:27 -0700
commitab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch)
tree6b48b82604e194016ca048ad912f8015de719999 /manifest.json
parent06f247d881f4cfd790d635c6e310ae7f97724339 (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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": {