diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-28 19:46:04 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-28 19:46:04 +0100 |
| commit | 0cd975bfd06b45865722d85fbdab120439623ddc (patch) | |
| tree | 790f442337f88cfecb20b0c62bfec2f61af83c94 /data | |
| parent | 5f327abeeca1953ff9d11f93afb9fbd9ceb825ba (diff) | |
| parent | 497d295be470454b7bd068a5c5cceda8caa19527 (diff) | |
Merge branch '729-move_data' into dev
To update, please follow instructions in https://github.com/FreshRSS/FreshRSS/issues/729
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/log/.gitignore | 1 | ||||
| -rw-r--r-- | data/users/.gitignore | 4 | ||||
| -rw-r--r-- | data/users/_/.gitkeep | 0 | ||||
| -rw-r--r-- | data/users/index.html (renamed from data/log/index.html) | 0 |
5 files changed, 4 insertions, 2 deletions
diff --git a/data/.gitignore b/data/.gitignore index 325fa75c6..20364e266 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,6 +1,5 @@ application.ini config.php -*_user.php *.sqlite touch.txt no-cache.txt diff --git a/data/log/.gitignore b/data/log/.gitignore deleted file mode 100644 index bf0824e59..000000000 --- a/data/log/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.log
\ No newline at end of file diff --git a/data/users/.gitignore b/data/users/.gitignore new file mode 100644 index 000000000..53ed0587b --- /dev/null +++ b/data/users/.gitignore @@ -0,0 +1,4 @@ +db.sqlite +config.php +log.txt + diff --git a/data/users/_/.gitkeep b/data/users/_/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/data/users/_/.gitkeep diff --git a/data/log/index.html b/data/users/index.html index 85faaa37e..85faaa37e 100644 --- a/data/log/index.html +++ b/data/users/index.html |