Merge branch 'master' of https://github.com/kalcaddle/KODExplorer
* 'master' of https://github.com/kalcaddle/KODExplorer: Update main.php Update main.php # Conflicts: # config/i18n/en/main.phppull/130/head
commit
2c5b5f0232
* 'master' of https://github.com/kalcaddle/KODExplorer: Update main.php Update main.php # Conflicts: # config/i18n/en/main.phppull/130/head