mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-22 03:35:26 +00:00
Merge branch 'dev' of /home/macgirvin/z into dev
This commit is contained in:
commit
f60b3e7a21
3 changed files with 1921 additions and 1872 deletions
|
@ -230,6 +230,11 @@ class Queue {
|
||||||
if($outq['outq_driver'] === 'activitypub') {
|
if($outq['outq_driver'] === 'activitypub') {
|
||||||
|
|
||||||
$channel = channelx_by_n($outq['outq_channel']);
|
$channel = channelx_by_n($outq['outq_channel']);
|
||||||
|
if (! $channel) {
|
||||||
|
logger('missing channel: ' . $outq['outq_channel']);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$retries = 0;
|
$retries = 0;
|
||||||
$m = parse_url($outq['outq_posturl']);
|
$m = parse_url($outq['outq_posturl']);
|
||||||
|
|
2
boot.php
2
boot.php
|
@ -16,7 +16,7 @@ use Zotlabs\Daemon\Run;
|
||||||
* @brief This file defines some global constants and includes the central App class.
|
* @brief This file defines some global constants and includes the central App class.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define ( 'STD_VERSION', '20.12.23' );
|
define ( 'STD_VERSION', '20.12.24' );
|
||||||
define ( 'ZOT_REVISION', '6.0' );
|
define ( 'ZOT_REVISION', '6.0' );
|
||||||
|
|
||||||
define ( 'DB_UPDATE_VERSION', 1247 );
|
define ( 'DB_UPDATE_VERSION', 1247 );
|
||||||
|
|
3786
util/messages.po
3786
util/messages.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue