diff options
| author | Zero~Informatique | 2020-02-13 18:17:35 +0100 |
|---|---|---|
| committer | Zero~Informatique | 2020-02-13 18:17:35 +0100 |
| commit | 6c51a97bce7963fba47892602c1214b3bcdcd410 (patch) | |
| tree | 0df87fda5a480718cf35b6087555039a706df524 /viewer/public | |
| parent | 9c2af5dcd2d2c8754e4c74e02141822c0964a5a8 (diff) | |
| parent | ef1778e051e007f08f9188a479d04fdf95a57d21 (diff) | |
| download | ldgallery-6c51a97bce7963fba47892602c1214b3bcdcd410.tar.gz | |
Merge branch 'oz-config-json' into develop
# Conflicts:
# scripts/win_compile_example.cmd
Diffstat (limited to 'viewer/public')
| -rw-r--r-- | viewer/public/config.json.example (renamed from viewer/public/config.json) | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/viewer/public/config.json b/viewer/public/config.json.example index 7023edb..90c5f74 100644 --- a/viewer/public/config.json +++ b/viewer/public/config.json.example | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | { | 1 | { |
| 2 | "generationTimestamp": 0, | ||
| 3 | "galleryRoot": "gallery/" | 2 | "galleryRoot": "gallery/" |
| 4 | } \ No newline at end of file | 3 | } \ No newline at end of file |