Merge branch 'master' into 'branch_to_merge'

# Conflicts:
#   config/settings/sch_mm.local.php.dist
parents 430ad94e f9d5b340
......@@ -12,6 +12,6 @@ return [
'api_url' => '',
'api_user' => '',
'api_pass' => '',
'public_api_url' => '', // currently working: 'https://mm.sch.gr/api/units
'public_api_url' => '', // currently working: 'https://mm.sch.gr/api/units'
]
];
];
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment