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 /Gruntfile.js | |
| 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 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index c7419549..8dc5b83b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js | |||
| @@ -45,6 +45,7 @@ module.exports = function (grunt) { | |||
| 45 | src: [ | 45 | src: [ |
| 46 | '<%= appDir %>/themes/material/js/init.js', | 46 | '<%= appDir %>/themes/material/js/init.js', |
| 47 | '<%= appDir %>/themes/_global/js/restoreScroll.js', | 47 | '<%= appDir %>/themes/_global/js/restoreScroll.js', |
| 48 | 'node_modules/jquery.tinydot/src/jquery.tinydot.js', | ||
| 48 | ], | 49 | ], |
| 49 | dest: '<%= buildDir %>/material.js', | 50 | dest: '<%= buildDir %>/material.js', |
| 50 | }, | 51 | }, |