Add latest changes from icehrm pro

2018-05-21 00:23:56 +02:00
parent 9c56b8acd1
commit 861e94cf9d
1375 changed files with 175006 additions and 2662 deletions
--- a/core/lib/composer/composer.json
+++ b/core/lib/composer/composer.json
@@ -7,7 +7,10 @@
        "filp/whoops": "~2.1",
        "swiftmailer/swiftmailer": "^6.0",
 		"pear/net_smtp": "^1.7",
-		"pear/mail": "^1.4"
+		"pear/mail": "^1.4",
+		"spomky-labs/base64url": "^1.0",
+		"cebe/markdown": "^1.2",
+		"neitanod/forceutf8": "^2.0"
    },
    "require-dev": {
      "phpunit/phpunit": "~6"