diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-02-17 16:53:58 +0100 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-02-17 16:53:58 +0100 |
| commit | 2b38742bce1691f653dee924c1f030d14053c49e (patch) | |
| tree | bf80308883fe0223146e6cda4d680fb876d43084 /server/core | |
| parent | a8b6e051b4a4346ec4b22e07207f8dc766833c9b (diff) | |
| parent | 47e7d7d5402b3096a7554193eec10ff4b8bb2c3b (diff) | |
Merge branch 'develop' into Eole
Diffstat (limited to 'server/core')
| -rw-r--r--[-rwxr-xr-x] | server/core/App.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/core/CoreInterface.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/core/Identity.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/core/LibOverride/genTokenOptions.php | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/server/core/App.php b/server/core/App.php index babb3d9..babb3d9 100755..100644 --- a/server/core/App.php +++ b/server/core/App.php diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php index ed0d959..ed0d959 100755..100644 --- a/server/core/CoreInterface.php +++ b/server/core/CoreInterface.php diff --git a/server/core/Identity.php b/server/core/Identity.php index 00199ec..00199ec 100755..100644 --- a/server/core/Identity.php +++ b/server/core/Identity.php diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index b71defa..b71defa 100755..100644 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php |