Merge branch 'FreshRSS/dev' into import_duplicates

4 files changed, 12 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aa5ada8a..fbc23e1b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 	* Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264)
 * Security
 	* Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245)
+	* Updated gitignore rules to keep user directories during a `git clean -f -d` [#1307](https://github.com/FreshRSS/FreshRSS/pull/1307)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * Extensions
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