diff options
| author | Jonathan Duran | 2012-04-23 09:54:54 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-23 09:54:54 -0700 |
| commit | e9b7e10b03cfe20ad145cb8b9cb8710a1917fb35 (patch) | |
| tree | f95925d626cd5b585e6718407a31d8e5d62daee7 /manifest.json | |
| parent | f1e01ab5c62bad8bcaf6c033cb251b889362f01d (diff) | |
| parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
| download | ninja-e9b7e10b03cfe20ad145cb8b9cb8710a1917fb35.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index 42fe43f4..b46c9826 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | "notifications", | 15 | "notifications", |
| 16 | "webRequest", | 16 | "webRequest", |
| 17 | "webRequestBlocking", | 17 | "webRequestBlocking", |
| 18 | "http://localhost:/" | 18 | "http://ninja/*" |
| 19 | ], | 19 | ], |
| 20 | "requirements": { | 20 | "requirements": { |
| 21 | "3D": { | 21 | "3D": { |