Merge branch 'master' into patch-1

cytopia · Nov 12, 2020 · d077656 · d077656
2 parents 81f344e + 87fa92d
commit d077656
Show file tree

Hide file tree

Showing 7,045 changed files with 488,554 additions and 427,121 deletions.
diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
@@ -13,8 +13,8 @@
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v1.7.2';
-$DEVILBOX_DATE = '2020-09-17';
+$DEVILBOX_VERSION = 'v1.8.0';
+$DEVILBOX_DATE = '2020-11-08';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

diff --git a/.devilbox/www/htdocs/vendor/adminer-4.7.5-en.php b/.devilbox/www/htdocs/vendor/adminer-4.7.5-en.php
diff --git a/.devilbox/www/htdocs/vendor/adminer-4.7.7-en-php8.php b/.devilbox/www/htdocs/vendor/adminer-4.7.7-en-php8.php
diff --git a/.devilbox/www/htdocs/vendor/adminer-4.7.7-en.php b/.devilbox/www/htdocs/vendor/adminer-4.7.7-en.php
diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/CODE_OF_CONDUCT.md b/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/CODE_OF_CONDUCT.md
diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/ChangeLog b/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/ChangeLog
diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/DCO b/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/DCO
diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/README b/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/README
diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/RELEASE-DATE-4.9.3 b/.devilbox/www/htdocs/vendor/phpmyadmin-4.9.3/RELEASE-DATE-4.9.3