diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
| commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
| tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /.gitignore | |
| parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
| parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
| download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
| @@ -10,6 +10,9 @@ | |||
| 10 | /var/sessions/* | 10 | /var/sessions/* |
| 11 | !var/sessions/.gitkeep | 11 | !var/sessions/.gitkeep |
| 12 | !var/SymfonyRequirements.php | 12 | !var/SymfonyRequirements.php |
| 13 | /bin/* | ||
| 14 | !/bin/console | ||
| 15 | !/bin/symfony_requirements | ||
| 13 | 16 | ||
| 14 | # Parameters | 17 | # Parameters |
| 15 | /app/config/parameters.yml | 18 | /app/config/parameters.yml |