diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-02 21:46:21 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-02 21:46:21 +0100 |
| commit | 30327efecd4fa7f4131cd0d7a5ac80b460af95d1 (patch) | |
| tree | c95cc258c85304954dafab03be2eb84590361d81 /data | |
| parent | a0f1b76918e7ce038ab8ea490d9f5ed0e625831e (diff) | |
| parent | a6623b7b2fa3f026a0ea30e49b1a221f7a4a8e55 (diff) | |
Merge branch 'FreshRSS/dev' into FreshRSS/dev-1.14.0
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/.gitignore b/data/.gitignore index 76314fc12..0410f3797 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,3 +1,4 @@ +.htpasswd config.php config.php.bak.php force-https.txt |