Merge branch '2019.01-rc' into bug/6334-escape-get-app

This commit is contained in:
Hypolite Petovan
2019-01-06 16:38:48 -05:00
committed by GitHub
27 changed files with 136 additions and 72 deletions

View File

@@ -35,7 +35,7 @@ use Friendica\Util\DateTimeFormat;
define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-rc');
define('FRIENDICA_VERSION', '2019.01-rc');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
@@ -870,4 +870,4 @@ function rdirname($path, $levels = 1)
} else {
return dirname($path);
}
}
}