diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-09-02 10:27:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 10:27:41 +0200 |
| commit | 336262e6ee9c57437793a06fb416206ac73a1702 (patch) | |
| tree | ca9f9312d0b52828a2d12a95fe7f5dd2fc138b7a /package.json | |
| parent | 33adf8dc915f4911fd454e98194c1b2323514d4a (diff) | |
| parent | a8d5aa1c44c3349a9271e5f0bc3cb5154d6505d9 (diff) | |
| download | wallabag-336262e6ee9c57437793a06fb416206ac73a1702.tar.gz wallabag-336262e6ee9c57437793a06fb416206ac73a1702.tar.zst wallabag-336262e6ee9c57437793a06fb416206ac73a1702.zip | |
Merge pull request #2252 from wallabag/fix-last-merge
Fixed last merge who caused CSS/JS bugs
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index 3ed7a49f..39a10e9c 100644 --- a/package.json +++ b/package.json | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | "jquery": "^2.2.1", | 28 | "jquery": "^2.2.1", |
| 29 | "jquery-ui": "^1.10.5", | 29 | "jquery-ui": "^1.10.5", |
| 30 | "jquery.cookie": "^1.4.1", | 30 | "jquery.cookie": "^1.4.1", |
| 31 | "jquery.tinydot": "^0.2.1", | ||
| 31 | "load-grunt-tasks": "^3.4.1", | 32 | "load-grunt-tasks": "^3.4.1", |
| 32 | "materialize-css": "0.97.5", | 33 | "materialize-css": "0.97.5", |
| 33 | "npm": "^3.8.3", | 34 | "npm": "^3.8.3", |