diff options
| author | Eole <EoleDev@outlook.fr> | 2016-01-26 10:35:02 +0100 |
|---|---|---|
| committer | Eole <EoleDev@outlook.fr> | 2016-01-26 10:35:02 +0100 |
| commit | a3ae22549e4fd08269ff644583b585f9940798c8 (patch) | |
| tree | 545a03f354d91b339a052ffe3b1c1760e9202068 | |
| parent | ef05e8a90d64022d6ecfbcb8ed0ab92d53adf243 (diff) | |
| parent | adc6633d3305dee2efdf714211bbc280167955f0 (diff) | |
Merge branch 'develop' into Eole
| -rw-r--r-- | client/index.html (renamed from client/index.php) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/client/index.php b/client/index.html index 0c02623..0c02623 100644 --- a/client/index.php +++ b/client/index.html |