Merge branch 'development' into 'master'

Added removal of old autocomplete module to updater.

See merge request xevidos/codiad!17
This commit is contained in:
Isaac Brown 2018-12-12 10:34:57 -05:00
commit e2dd07a6bc
1 changed files with 1 additions and 0 deletions

View File

@ -501,6 +501,7 @@ ALTER TABLE `user_options` MODIFY `id` INT(11) NOT NULL AUTO_INCREMENT;
*/
$folder_conflictions = array(
$this->path . "/components/autocomplete",
$this->path . "/plugins/auto_save",
$this->path . "/plugins/Codiad-Auto-Save",
$this->path . "/plugins/Codiad-Auto-Save-master",