diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-03-23 14:43:27 +0100 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-03-23 14:43:27 +0100 |
| commit | d3fc2ab36ced70c8eb20e7f85f900425b7781667 (patch) | |
| tree | e325f9dce61a176e5a1d5585461ddd19c668b5fd /server/config.inc.php | |
| parent | a26989103d70fb0dd3ff6834de107cae246778c3 (diff) | |
| parent | f9643dd9ffeec5eda4f563dd695135ac3a681d60 (diff) | |
Merge branch 'Eole' into develop
Conflicts:
client/js/controllers/home/home.js
Diffstat (limited to 'server/config.inc.php')
| -rw-r--r-- | server/config.inc.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/config.inc.php b/server/config.inc.php index 9767c72..636ee5e 100644 --- a/server/config.inc.php +++ b/server/config.inc.php @@ -5,6 +5,7 @@ $config["modules_enabled"] = ""; $config["urlAuth"] = "http://148.60.11.31:5000/v3"; + $config["tokenTime"] = 60 //miunte = 60 //miuntess ?> |