Merge branch 'master' into resseler-to-customer

2018-10-17 13:44:15 +02:00
parent 755fc75ae9 ecde654ae9
commit 6c27afabfc
17 changed files with 411 additions and 321 deletions
--- a/backend/app/plugins/wiaas/wiaas.php
+++ b/backend/app/plugins/wiaas/wiaas.php
@@ -28,6 +28,7 @@ if (is_admin()) {
    include_once WIAAS_DIR . '/includes/class-wiaas-admin.php';
 }

+include_once WIAAS_DIR . '/includes/class-wiaas-access-management.php';
 include_once WIAAS_DIR . '/includes/class-wiaas-db.php';

 include_once WIAAS_DIR . '/includes/class-wiaas-delivery-process.php';