diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-01 22:15:46 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-01 22:15:46 +0200 |
| commit | e1d64050ad6f54e45d3954ffac21daaee58c6240 (patch) | |
| tree | b75342f245905c7d17dc5af80cc5412545490d6c /.gitignore | |
| parent | 3cbb0cc3ef89873a06bda6583747a2660b989fb8 (diff) | |
| parent | 9579003045970d4feed9de955fe939d4f02fe439 (diff) | |
| download | wallabag-e1d64050ad6f54e45d3954ffac21daaee58c6240.tar.gz wallabag-e1d64050ad6f54e45d3954ffac21daaee58c6240.tar.zst wallabag-e1d64050ad6f54e45d3954ffac21daaee58c6240.zip | |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -51,3 +51,7 @@ bin | |||
| 51 | app/Resources/build/ | 51 | app/Resources/build/ |
| 52 | !/src/Wallabag/CoreBundle/Resources/public | 52 | !/src/Wallabag/CoreBundle/Resources/public |
| 53 | /src/Wallabag/CoreBundle/Resources/public/* | 53 | /src/Wallabag/CoreBundle/Resources/public/* |
| 54 | |||
| 55 | # Test-generated files | ||
| 56 | admin-export.json | ||
| 57 | specialexport.json | ||