diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-09 15:53:10 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-09 15:53:10 +0200 |
| commit | f97d4b3b6cca4a55636bbd50158f3c57666b0f08 (patch) | |
| tree | 3ca9dd42155228292f0842d65b9b6d90e9140639 /public/data | |
| parent | e51ceb6812e3736aa9b9ce1f2d5181f5b4b6aaa3 (diff) | |
| parent | 444b1552364b39761c3278c7da5152fd3998f216 (diff) | |
Merge branch 'master' into hotfixes
Diffstat (limited to 'public/data')
| -rw-r--r-- | public/data/.gitignore | 3 | ||||
| -rw-r--r-- | public/data/grey.gif | bin | 56 -> 0 bytes |
2 files changed, 0 insertions, 3 deletions
diff --git a/public/data/.gitignore b/public/data/.gitignore deleted file mode 100644 index 315458098..000000000 --- a/public/data/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -favicons -Configuration.array.php -*.sqlite diff --git a/public/data/grey.gif b/public/data/grey.gif Binary files differdeleted file mode 100644 index c7212bc1f..000000000 --- a/public/data/grey.gif +++ /dev/null |
