diff options
| author | lizyn <zhiylin@outlook.com> | 2020-02-24 10:04:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 10:04:13 +0800 |
| commit | b19df31d78d881a43bcf6b3215e5fc3781e8e8aa (patch) | |
| tree | d0d9861694a4b5e5fbfdbeb53c255ecd15fe9328 /.gitignore | |
| parent | 4d0c632c70ea50d459c3c55ddda2e0f394dd51cb (diff) | |
| parent | 04d918cae0227c06a41d27fb6533dddbf30dfe71 (diff) | |
| download | wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.gz wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.zst wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.zip | |
Merge pull request #1 from wallabag/master
Keep up with the master again
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 4 insertions, 3 deletions
| @@ -32,6 +32,7 @@ web/uploads/ | |||
| 32 | # Build | 32 | # Build |
| 33 | /app/build | 33 | /app/build |
| 34 | /build | 34 | /build |
| 35 | /coverage | ||
| 35 | 36 | ||
| 36 | # Composer PHAR | 37 | # Composer PHAR |
| 37 | /composer.phar | 38 | /composer.phar |
| @@ -43,9 +44,6 @@ data/db/wallabag*.sqlite | |||
| 43 | docker/logs/ | 44 | docker/logs/ |
| 44 | docker/data/ | 45 | docker/data/ |
| 45 | 46 | ||
| 46 | # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release | ||
| 47 | composer.lock | ||
| 48 | |||
| 49 | # assets stuff | 47 | # assets stuff |
| 50 | node_modules/ | 48 | node_modules/ |
| 51 | bin | 49 | bin |
| @@ -57,3 +55,6 @@ app/Resources/build/ | |||
| 57 | admin-export.json | 55 | admin-export.json |
| 58 | specialexport.json | 56 | specialexport.json |
| 59 | /data/site-credentials-secret-key.txt | 57 | /data/site-credentials-secret-key.txt |
| 58 | |||
| 59 | # Custom CSS file | ||
| 60 | web/custom.css | ||