Merge remote-tracking branch 'upstream/develop' into worker-class

2017-11-05 17:23:53 +00:00
parent 84c3c0753e 2f0005713f
commit 930309d2ec
116 changed files with 916 additions and 491 deletions
--- a/src/App.php
+++ b/src/App.php
@@ -211,7 +211,6 @@ class App {
 			get_include_path() . PATH_SEPARATOR
 			. $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
 			. $this->basepath . DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR
-			. $this->basepath . DIRECTORY_SEPARATOR . 'library/langdet' . PATH_SEPARATOR
 			. $this->basepath);