Merge branch 'dev'

This commit is contained in:
zotlabs 2020-02-20 18:18:24 -08:00
commit bbdbd50b87
2 changed files with 2 additions and 1 deletions

View file

@ -8,6 +8,7 @@ use Zotlabs\Access\PermissionRoles;
use Zotlabs\Access\PermissionLimits;
use Zotlabs\Daemon\Master;
use Zotlabs\Lib\PConfig;
use Emoji;
require_once('include/html2bbcode.php');
require_once('include/html2plain.php');

View file

@ -48,7 +48,7 @@ require_once('include/items.php');
define ( 'STD_VERSION', '20.02.19' );
define ( 'STD_VERSION', '20.02.21' );
define ( 'ZOT_REVISION', '6.0' );
define ( 'DB_UPDATE_VERSION', 1237 );