diff options
| author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
|---|---|---|
| committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
| commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
| tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /.gitignore | |
| parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
| parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
| download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip | |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 13 |
1 files changed, 11 insertions, 2 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 |
| @@ -41,3 +43,10 @@ docker/data/ | |||
| 41 | 43 | ||
| 42 | # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release | 44 | # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release |
| 43 | composer.lock | 45 | composer.lock |
| 46 | |||
| 47 | # assets stuff | ||
| 48 | node_modules/ | ||
| 49 | bin | ||
| 50 | app/Resources/build/ | ||
| 51 | !/src/Wallabag/CoreBundle/Resources/public | ||
| 52 | /src/Wallabag/CoreBundle/Resources/public/* | ||