Merge branch 'develop' into rewrites/coding-convention-split2

2017-04-01 22:16:08 +02:00
parent 3cea176ef2 7cd795d795
commit 49527b70d3
93 changed files with 11433 additions and 33261 deletions
@@ -649,7 +649,6 @@ class App {
 		set_include_path(
 				'include' . PATH_SEPARATOR
 				. 'library' . PATH_SEPARATOR
-				. 'library/phpsec' . PATH_SEPARATOR
 				. 'library/langdet' . PATH_SEPARATOR
 				. '.' );