Merge remote-tracking branch 'origin/master' into feature/BACKLOG-860
Merge remote-tracking branch 'origin/master' into feature/BACKLOG-860
Merge branch 'feature/BACKLOG-860'
Merge remote-tracking branch 'origin/master' into feature/BACKLOG-882
Merge branch 'feature/BACKLOG-882'
Updated release notes
Merge branch 'release-3.0'
Corrected release notes
Merge branch 'release-3.0'
BACKLOG-923 Config files are now parsed first and merged afterwards which makes debugging errors in files a lot easier.
BACKLOG-923 Made config parse exception message a little more verbose
BACKLOG-923 returned to strategy of merging config file first and only parse one string, with a fallback to parse each file separately in case of parse errors
BACKLOG-923 Reverted some differences with original code
BACKLOG-923 Reverted some differences with original code #2
BACKLOG-923 Reverted some differences with original code #3
library/EngineBlock/Application/Bootstrapper.php #4
Merge remote-tracking branch 'origin/master' into BACKLOG-923
Added release notes
Merge branch 'BACKLOG-923'
Merge remote-tracking branch 'origin/master' into release-3.0