Merge branch 'FreshRSS/dev' into import_duplicates

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

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

data/PubSubHubbub/feeds/.gitignore

@@ -1 +1,3 @@
-*/*
+*/
+*/*.json
+*/*.txt

data/users/.gitignore

@@ -1,4 +1,5 @@
-db.sqlite
-config.php
-log*.txt
-
+*/
+*/config.php
+*/db.sqlite
+!_/
+*/log*.txt