diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-15 14:11:07 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-15 14:11:07 +0200 |
| commit | d308e901e69990c59b9f5a6c48dba896d3e696f2 (patch) | |
| tree | 566a82a8b5b647fc44270a8fb8761c54d61330d0 /data | |
| parent | a0127d980c37b69c48db6982733fac60eaf8601c (diff) | |
| parent | f0c5943250c5a9582ebb752b92ca639cad9d283e (diff) | |
Merge branch 'FreshRSS/dev' into import_duplicates
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 10 | ||||
| -rw-r--r-- | data/PubSubHubbub/feeds/.gitignore | 4 | ||||
| -rw-r--r-- | data/users/.gitignore | 9 |
3 files changed, 11 insertions, 12 deletions
diff --git a/data/.gitignore b/data/.gitignore index c2ed350a6..76314fc12 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,10 +1,6 @@ -application.ini config.php -*.sqlite -touch.txt -no-cache.txt -*.bak.php -*.lock.txt +config.php.bak.php +force-https.txt last_update.txt +no-cache.txt update.php -force-https.txt diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore index 150f68c80..d8f9df042 100644 --- a/data/PubSubHubbub/feeds/.gitignore +++ b/data/PubSubHubbub/feeds/.gitignore @@ -1 +1,3 @@ -*/* +*/ +*/*.json +*/*.txt diff --git a/data/users/.gitignore b/data/users/.gitignore index a8b7cd60f..3705c06b7 100644 --- a/data/users/.gitignore +++ b/data/users/.gitignore @@ -1,4 +1,5 @@ -db.sqlite -config.php -log*.txt - +*/ +*/config.php +*/db.sqlite +!_/ +*/log*.txt |