diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2016-10-04 16:26:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 16:26:50 +0200 |
| commit | 57386125abc5c50c1438cf7e78d01f06021adc0a (patch) | |
| tree | d3f26102f9697247c93ac69db6000d15e96fbb23 /.gitignore | |
| parent | f2ab290f0fc8a2909bb490e0ed2d91a677a95cc4 (diff) | |
| parent | c10adc1f762d004350a7921250c6821baa866e2d (diff) | |
| download | wallabag-57386125abc5c50c1438cf7e78d01f06021adc0a.tar.gz wallabag-57386125abc5c50c1438cf7e78d01f06021adc0a.tar.zst wallabag-57386125abc5c50c1438cf7e78d01f06021adc0a.zip | |
Merge pull request #2353 from wallabag/assets-fix
Basically, fix everything
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 15 |
1 files changed, 8 insertions, 7 deletions
| @@ -21,8 +21,10 @@ | |||
| 21 | /vendor/ | 21 | /vendor/ |
| 22 | 22 | ||
| 23 | # Assets and user uploads | 23 | # Assets and user uploads |
| 24 | /web/bundles/ | 24 | web/uploads/ |
| 25 | /web/uploads/ | 25 | !web/bundles |
| 26 | web/bundles/* | ||
| 27 | !web/bundles/wallabagcore | ||
| 26 | 28 | ||
| 27 | # Build | 29 | # Build |
| 28 | /app/build | 30 | /app/build |
| @@ -43,9 +45,8 @@ docker/data/ | |||
| 43 | composer.lock | 45 | composer.lock |
| 44 | 46 | ||
| 45 | # assets stuff | 47 | # assets stuff |
| 46 | /node_modules/ | 48 | node_modules/ |
| 47 | !app/Resources/static/lib | 49 | bin |
| 48 | app/Resources/static/lib/* | 50 | app/Resources/build/ |
| 49 | /bin | ||
| 50 | !/src/Wallabag/CoreBundle/Resources/public | 51 | !/src/Wallabag/CoreBundle/Resources/public |
| 51 | /src/Wallabag/CoreBundle/Resources/public/* \ No newline at end of file | 52 | /src/Wallabag/CoreBundle/Resources/public/* |