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/core/App.php | |
| parent | a26989103d70fb0dd3ff6834de107cae246778c3 (diff) | |
| parent | f9643dd9ffeec5eda4f563dd695135ac3a681d60 (diff) | |
Merge branch 'Eole' into develop
Conflicts:
client/js/controllers/home/home.js
Diffstat (limited to 'server/core/App.php')
| -rwxr-xr-x | server/core/App.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/core/App.php b/server/core/App.php index d35ccc0..e3c9c22 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -37,6 +37,10 @@ class App{ }
+ public function checkToken(){
+ $this->tokenClass->checkToken();
+ }
+
public function getLibClass($service){
switch($service){
|