Log

description author age
mod_mam: Use stanza id in log message as fallback if no query id Kim Alvefur Thu, 11 Jul 2019 23:26:02 +0200
mod_mam: Include username that performed query Kim Alvefur Thu, 11 Jul 2019 23:30:58 +0200
mod_mam: Make log message more compact Kim Alvefur Thu, 11 Jul 2019 23:22:59 +0200
mod_pubsub: Move a comment to where it makes sense Kim Alvefur Wed, 10 Jul 2019 19:12:19 +0200
util.error: Fix traceback due to missing text field Kim Alvefur Wed, 10 Jul 2019 17:04:36 +0200
mod_admin_telnet: Move error handling to thread callback (fixes #1391) Kim Alvefur Fri, 10 May 2019 01:29:26 +0200
mod_admin_telnet: Check for simple commands before executing in sandbox Kim Alvefur Fri, 10 May 2019 01:28:09 +0200
mod_pep: Only log when creating new pubsub services Kim Alvefur Tue, 09 Jul 2019 15:12:32 +0200
net.http.files: Fix cache handling Kim Alvefur Sat, 29 Jun 2019 19:19:38 +0200
prosodyctl: Fix extraction of interpreter from arg when additional arguments (fixes #1386) Kim Alvefur Sat, 29 Jun 2019 16:54:39 +0200
MUC: Advertise language field as such via XEP-0122 Kim Alvefur Sun, 07 Jul 2019 19:15:35 +0200
mod_pubsub: Expose pubsub#access_model and pubsub#publish_model (fixes #1387) Kim Alvefur Sat, 06 Jul 2019 17:47:06 +0200
Merge 0.11->trunk Kim Alvefur Mon, 08 Jul 2019 02:44:32 +0200
util.serialization: Cache default serialization instance (fixes #1389) 0.11 Kim Alvefur Mon, 08 Jul 2019 02:46:27 +0200
net.server_epoll: Backport timer optimization 6c2370f17027 from trunk (see #1388) 0.11 Kim Alvefur Mon, 08 Jul 2019 01:17:34 +0200
Merge 0.11->trunk Kim Alvefur Thu, 20 Jun 2019 22:26:46 +0200
scansion/blocking: Remove the right irrelevant thing 0.11 Kim Alvefur Thu, 20 Jun 2019 22:25:46 +0200
Merge 0.11->trunk Kim Alvefur Thu, 20 Jun 2019 22:12:49 +0200
mod_blocklist: Remove unrelated tags from test case 0.11 Kim Alvefur Thu, 20 Jun 2019 22:10:19 +0200
mod_blocklist: Add comment to clarify some logic Kim Alvefur Thu, 20 Jun 2019 21:44:43 +0200
Merge 0.11->trunk Kim Alvefur Thu, 20 Jun 2019 21:40:27 +0200
mod_blocklist: Trigger resend of presence when unblocking a contact (fixes #1380) 0.11 Kim Alvefur Thu, 20 Jun 2019 21:20:00 +0200
mod_blocklist: Update test case with correct behavior (see #1380) 0.11 Kim Alvefur Thu, 20 Jun 2019 21:18:46 +0200
mod_blocklist: Add test case capturing current behavior 0.11 Kim Alvefur Thu, 20 Jun 2019 21:08:12 +0200
util.dependencies: Increase Lua version to warn about to 5.4 Kim Alvefur Wed, 19 Jun 2019 19:16:09 +0200
MUC: Reflow event tables to improve readability Kim Alvefur Wed, 19 Jun 2019 08:51:39 +0200
mod_pep: Log node name instead of payload Kim Alvefur Sun, 16 Jun 2019 22:02:53 +0200
Merge 0.11->trunk Kim Alvefur Mon, 10 Jun 2019 13:22:22 +0200
mod_pep: Revert 045209b41b3a, caused a regression 0.11 Kim Alvefur Mon, 10 Jun 2019 12:58:00 +0200
mod_admin_telnet: Collect array from Bosh connections when appending to connection list Michel Le Bihan Mon, 03 Jun 2019 20:51:15 +0200
core/sessionmanager: Remove unnecessary fallback in make_authenticated Maxime “pep” Buquet Sat, 01 Jun 2019 15:00:35 +0200
prosody: Also log status code passed to exit() Kim Alvefur Fri, 31 May 2019 18:50:34 +0200
prosody: Log shutdown reason (in past tense) as the very last thing Kim Alvefur Fri, 31 May 2019 18:50:13 +0200
prosody: Log shutdown reason Kim Alvefur Fri, 31 May 2019 17:01:22 +0200
Merge 0.11->trunk Kim Alvefur Fri, 31 May 2019 00:04:05 +0200
util.sql: Ignore if tables and indices already exist on creation (fixes #1064) 0.11 Kim Alvefur Thu, 30 May 2019 23:50:28 +0200
Merge 0.11->trunk Kim Alvefur Thu, 30 May 2019 21:44:35 +0200
mod_pep: Handle presence based subscription outside of util.pubsub (fixes #1372) 0.11 Kim Alvefur Thu, 30 May 2019 15:16:56 +0200
util.format: Handle integer formats the same way on Lua versions without integer support Kim Alvefur Thu, 30 May 2019 13:54:11 +0200
util.format: Handle formats expecting an integer in Lua 5.3+ (fixes #1371) Kim Alvefur Thu, 30 May 2019 13:41:05 +0200
mod_storage_sql: Ignore shadowed error variable [luacheck] Kim Alvefur Tue, 28 May 2019 00:56:30 +0200
mod_storage_sql: Fix to use correct arguments to archive id lookup Kim Alvefur Tue, 28 May 2019 00:47:50 +0200
mod_storage_sql: Correctly return item-not-found error Kim Alvefur Tue, 28 May 2019 00:46:24 +0200
Merge 0.11->trunk Kim Alvefur Mon, 27 May 2019 19:17:12 +0200
mod_muc_mam: Cache last date that archive owner has messages to reduce writes (fixes #1368) 0.11 Kim Alvefur Mon, 27 May 2019 19:00:34 +0200
mod_mam: Cache last date that archive owner has messages to reduce writes (fixes #1368) 0.11 Kim Alvefur Mon, 27 May 2019 19:00:32 +0200
Merge 0.11->trunk Kim Alvefur Mon, 27 May 2019 12:14:05 +0200
mod_announce: Check for admin on current virtualhost instead of global (fixes #1365) (thanks yc) 0.11 Kim Alvefur Mon, 27 May 2019 12:05:35 +0200
mod_csi_simple: Disable optimizations on disconnect (fixes #1358) Kim Alvefur Sun, 26 May 2019 15:04:16 +0200
mod_storage_internal: Return appropriate error even with empty archive Kim Alvefur Sun, 05 May 2019 07:24:12 +0200
mod_storage_memory: Return correct error even if no archive data available Kim Alvefur Sun, 05 May 2019 07:22:18 +0200
mod_muc_mam: Propagate item-not-found to client (fixes #1325) Kim Alvefur Sun, 05 May 2019 07:16:03 +0200
mod_mam: Propagate item-not-found to client (fixes #1325) Kim Alvefur Sun, 05 May 2019 07:16:05 +0200
mod_storage_sql: Look up archive IDs in separate queries (fixes #1325) Kim Alvefur Sat, 23 Mar 2019 00:51:10 +0100
mod_storage_memory: Return error if 'before' or 'after' are not found (partial fix for #1325) Kim Alvefur Tue, 05 Mar 2019 00:16:41 +0100
mod_storage_internal: Return error if 'before' or 'after' are not found (partial fix for #1325) Kim Alvefur Tue, 05 Mar 2019 00:12:30 +0100
Merge 0.11->trunk Kim Alvefur Sun, 26 May 2019 19:41:58 +0200
util.random: Throw different error for EOL condition 0.11 Kim Alvefur Tue, 21 May 2019 08:52:21 +0200
util.random: Coerce error to string (thanks waqas) 0.11 Kim Alvefur Sat, 18 May 2019 18:51:25 +0200
util.random: Handle unlikely read errors from /dev/urandom (see #1313) 0.11 Kim Alvefur Sat, 18 May 2019 17:28:21 +0200
mod_c2s: Associate connection with session last (fixes #1313) 0.11 Kim Alvefur Sat, 18 May 2019 17:45:20 +0200
mod_storage_sql: Handle SQLite DELETE with LIMIT being optional (fixes #1359) 0.11 Kim Alvefur Mon, 13 May 2019 14:39:38 +0200
mod_storage_sql: Move code out of if-else chain 0.11 Kim Alvefur Mon, 13 May 2019 14:47:41 +0200
configure: Respect previously set paths in macosx preset Kim Alvefur Mon, 13 May 2019 12:00:28 +0200
configure: Remove preset settings that are autodiscovered Kim Alvefur Mon, 13 May 2019 11:59:00 +0200
configure: Handle ostype preset after argument processing Kim Alvefur Mon, 13 May 2019 11:52:16 +0200
util.hashring: Add tests Matthew Wild Mon, 13 May 2019 10:36:03 +0100
util.encodings: Declare absence of arguments [-Wstrict-prototypes] Kim Alvefur Mon, 13 May 2019 11:30:45 +0200
util.hashring: Implementation of hashring data structure Matthew Wild Mon, 13 May 2019 10:03:46 +0100
migrator: Add support for archives (fixes #651) Kim Alvefur Sun, 05 May 2019 21:31:15 +0200
migrator: Rewrite to use storage modules Kim Alvefur Sun, 05 May 2019 21:32:34 +0200
mod_storage_sql: Add support for iterating over users in archive stores Kim Alvefur Sun, 05 May 2019 16:26:01 +0200
mod_storage_internal: Add support for iterating over users in archive stores Kim Alvefur Sun, 05 May 2019 16:07:16 +0200
mod_muc_mam: Handle archive quotas Kim Alvefur Sun, 05 May 2019 14:52:34 +0200
Merge 0.11->trunk Kim Alvefur Sun, 05 May 2019 08:55:05 +0200
configure: Handle lua being found in /bin (workaround for #1353) 0.11 Kim Alvefur Sat, 04 May 2019 22:48:59 +0200
mod_storage_internal,memory: Only return total count if requested Kim Alvefur Sun, 05 May 2019 08:12:16 +0200
net.http.files: Bump cache hits so they stay cached Kim Alvefur Sat, 04 May 2019 04:48:40 +0200
Merge 0.11->trunk Kim Alvefur Sat, 04 May 2019 04:33:41 +0200
net.server_epoll: Restore wantread flag after pause (fixes #1354) 0.11 Kim Alvefur Sat, 04 May 2019 04:23:35 +0200
Fix various spelling mistakes [codespell] Kim Alvefur Fri, 03 May 2019 20:54:24 +0200
Merge 0.11->trunk Kim Alvefur Fri, 03 May 2019 18:14:14 +0200
prosodyctl: Include version of LuaDBI in 'about' 0.11 Kim Alvefur Wed, 01 May 2019 22:34:15 +0200
mod_bosh: Added metrics for active/inactive sessions, new BOSH sessions, BOSH errors, and timeouts (finishes #998) Arc Riley Fri, 03 May 2019 04:10:31 -0700
mod_admin_telnet: include BOSH connections in c2s:count (#998) Arc Riley Thu, 02 May 2019 17:44:21 -0700
mod_admin_telnet: added "(bosh)" and "(websocket)" connection flags (#998) Arc Riley Thu, 02 May 2019 17:28:49 -0700
mod_admin_telnet: include BOSH connections in c2s session commands (#998) Arc Riley Thu, 02 May 2019 16:33:14 -0700
mod_mimicking: Improve error handling Kim Alvefur Mon, 29 Apr 2019 17:27:08 +0200
mod_mimicking: Use more intuitive term "mimicry index" for skeletons Kim Alvefur Mon, 29 Apr 2019 17:26:56 +0200
mod_mimicking: Update command to work with current code Kim Alvefur Mon, 29 Apr 2019 02:40:14 +0200
mod_mimicking: Use new storage API Kim Alvefur Mon, 29 Apr 2019 02:38:55 +0200
mod_mimicking: Hook the correct event names Kim Alvefur Mon, 29 Apr 2019 02:37:35 +0200
mod_mimicking: Import skeleton() from current location Kim Alvefur Mon, 29 Apr 2019 02:40:39 +0200
mod_mimicking: Prevents registration of confusable usernames (by Florob) (fixes #1347) Kim Alvefur Mon, 06 Aug 2012 15:35:27 +0200
util.encodings: Add compat with ICU before version 58 Kim Alvefur Mon, 29 Apr 2019 15:53:52 +0200
CHANGES: Remove MAM change that got rebased to 0.11 Kim Alvefur Mon, 29 Apr 2019 03:07:35 +0200
CHANGES: New in trunk so far Kim Alvefur Mon, 29 Apr 2019 03:05:25 +0200
util.encodings: Add binding to confusables skeleton function in ICU Kim Alvefur Wed, 24 Apr 2019 22:40:38 +0200
Merge 0.11->trunk Kim Alvefur Wed, 24 Apr 2019 18:06:48 +0200
mod_admin_telnet: Adds c2s:closeall() (Fixes #1315) João Duarte Wed, 17 Apr 2019 10:11:22 -0700
util.encodings: Allow unassigned code points in ICU mode to match libidn behavior (fixes #1348) 0.11 Kim Alvefur Wed, 24 Apr 2019 16:16:19 +0200
core.portmanager: Log debug message for each kind of TLS context created 0.11 Kim Alvefur Tue, 23 Apr 2019 19:21:06 +0200
mod_tls: Log debug message for each kind of TLS context created 0.11 Kim Alvefur Tue, 23 Apr 2019 19:13:50 +0200
Backed out changeset 61bc5c52c941 Kim Alvefur Sun, 21 Apr 2019 00:59:36 +0200
util.hashes: Allow specifying output key length Kim Alvefur Sat, 20 Apr 2019 15:11:04 +0200
util.hashes: Add PBKDF2-HMAC-SHA256 Kim Alvefur Sun, 13 Jan 2019 13:59:26 +0100
util.hashes: Rename PBKDF2 function Kim Alvefur Sun, 13 Jan 2019 13:57:18 +0100
util.hashes: Remove now unused hmac() function Kim Alvefur Fri, 19 Apr 2019 13:24:32 +0200
util.hashes: Use PBKDF2 from libcrypto Kim Alvefur Sun, 13 Jan 2019 13:57:14 +0100
util.hashes: Add test vectors from RFC 6070 for PBKDF2 (aka SCRAM Hi()) Kim Alvefur Fri, 19 Apr 2019 14:12:28 +0200
Merge 0.11->trunk Kim Alvefur Fri, 19 Apr 2019 13:21:00 +0200
util.hashes: Use HMAC function provided by OpenSSL (fixes #1345) 0.11 Kim Alvefur Fri, 19 Apr 2019 13:12:00 +0200
util.hmac: Ignore long hex lines in tests Kim Alvefur Fri, 19 Apr 2019 13:17:49 +0200
util.hmac: Generate test cases from RFC 4231 Kim Alvefur Thu, 11 Apr 2019 00:41:48 +0200
util.hmac: Expose hmac-sha-512 too Kim Alvefur Fri, 19 Apr 2019 12:47:49 +0200
util.hmac: Reflow code Kim Alvefur Fri, 19 Apr 2019 12:46:24 +0200
util.hashes: Remove redundant semicolon Kim Alvefur Fri, 19 Apr 2019 12:41:38 +0200
Merge 0.11->trunk Kim Alvefur Sun, 14 Apr 2019 02:11:52 +0200
util.ip: Add missing netmask for 192.168/16 range (fixes #1343) 0.11 Kim Alvefur Sun, 14 Apr 2019 02:06:20 +0200
util.poll: Minimize scope of methods Kim Alvefur Sat, 13 Apr 2019 23:55:34 +0200
Merge 0.11->trunk Kim Alvefur Sat, 13 Apr 2019 18:23:02 +0200
net.dns: Close resolv.conf handle when done (fixes #1342) 0.11 Kim Alvefur Sat, 13 Apr 2019 18:16:28 +0200
mod_http_files: Try to determine which module using serve() needs updating Kim Alvefur Fri, 05 Apr 2019 18:18:23 +0200
mod_http_files: Use net.http.files Kim Alvefur Fri, 05 Apr 2019 17:12:19 +0200
net.http.files: Make into standalone library Kim Alvefur Fri, 05 Apr 2019 17:09:03 +0200
net.http.files: Copy of mod_http_files Kim Alvefur Fri, 05 Apr 2019 16:10:51 +0200
util.session: Fix session id not include unauthed forever Kim Alvefur Wed, 03 Apr 2019 17:20:57 +0200
CONTRIBUTING: Add a short file referencing the online doc/contributing page Kim Alvefur Wed, 03 Apr 2019 01:09:21 +0200
README: Add link to current issue tracker Kim Alvefur Wed, 03 Apr 2019 01:03:23 +0200
README: Remove mailing list where issue tracker changes went in the Google Code days Kim Alvefur Wed, 03 Apr 2019 01:02:36 +0200
mod_limits: Fix typo Kim Alvefur Tue, 02 Apr 2019 21:22:20 +0200
mod_limits: Allow configuring a list of unrestricted JIDs (fixes #1323) Kim Alvefur Tue, 02 Apr 2019 20:38:51 +0200
mod_limits: Fix indentation Kim Alvefur Tue, 02 Apr 2019 21:17:28 +0200
.luacheckrc: Correct indentation of 'exclude_files' list Kim Alvefur Mon, 01 Apr 2019 21:15:47 +0200
doc/coding_style: apply consistent semi-colon usage marc0s Sat, 30 Mar 2019 18:44:34 +0100
core.s2smanager: Fix previous commit (Thanks Martin) Kim Alvefur Sat, 30 Mar 2019 09:04:33 +0100
core.sessionmanager: Use util.session to create sessions Kim Alvefur Fri, 29 Mar 2019 23:05:08 +0100
core.s2smanager: Use util.session to create sessions Kim Alvefur Fri, 29 Mar 2019 22:40:53 +0100
core.s2smanager: Spread out session tables over multiple lines Kim Alvefur Fri, 29 Mar 2019 22:37:12 +0100
core.s2smanager: Rename variable to be same in two functions Kim Alvefur Fri, 29 Mar 2019 22:45:54 +0100
Merge 0.11->trunk Kim Alvefur Thu, 28 Mar 2019 17:28:20 +0100
net.server_epoll: Skip delayed continuation read on paused connections 0.11 Kim Alvefur Thu, 28 Mar 2019 12:52:55 +0100
net.server_epoll: Handle LuaSec wantread/wantwrite conditions before callbacks (fixes #1333) 0.11 Kim Alvefur Thu, 28 Mar 2019 12:31:14 +0100
moduleapi: Log suppressed status priority and message when not overriding Matthew Wild Tue, 26 Mar 2019 17:22:56 +0000
moduleapi: Remove overly-verbose debug logging on module status change Matthew Wild Tue, 26 Mar 2019 17:22:25 +0000
mod_posix: Remove unnecessary import of util.format (thanks luacheck and buildbot) Matthew Wild Tue, 26 Mar 2019 14:59:42 +0000
loggingmanager, mod_posix: Move syslog to core, fixes #541 (in a way) Matthew Wild Tue, 26 Mar 2019 14:48:21 +0000
util.queue: Update :items() to consistently use private data directly Matthew Wild Tue, 26 Mar 2019 13:54:14 +0000
Backed out changeset 3eea63a68e0f Matthew Wild Tue, 26 Mar 2019 13:51:06 +0000
util.stanza: Fix :top_tag() handling of namespaced attributes Matthew Wild Mon, 25 Mar 2019 14:37:43 +0000
mod_csi_simple: Include queue size in debug messages Kim Alvefur Mon, 25 Mar 2019 15:20:28 +0100
mod_csi_simple: Fix type in function name Matthew Wild Mon, 25 Mar 2019 10:32:39 +0000
mod_csi_simple: Improve debug logs by mentioing why the buffer gets flushed Kim Alvefur Sun, 24 Mar 2019 22:01:36 +0100
mod_csi_simple: Add some debug logging Kim Alvefur Sun, 24 Mar 2019 20:53:49 +0100
mod_csi_simple: Disable optimizations on unload and re-enable on load Kim Alvefur Sun, 24 Mar 2019 20:43:15 +0100
mod_csi_simple: Separate out functions to enable/disable optimizations Kim Alvefur Sun, 24 Mar 2019 20:41:25 +0100
mod_csi_simple: Remove old "pump" queue/buffer method, handled in net.server now Kim Alvefur Sun, 24 Mar 2019 20:22:01 +0100
net.server_select: Fix write pause/resume functions Kim Alvefur Sun, 24 Mar 2019 20:12:22 +0100
net.server_event: Allow writing into buffer of write-locked connections Kim Alvefur Sun, 24 Mar 2019 19:07:39 +0100
mod_csi_simple: Also flush buffer in "pump" mode Kim Alvefur Sun, 24 Mar 2019 19:02:40 +0100
mod_csi_simple: Trigger buffer flush on seeing incoming data Kim Alvefur Sun, 24 Mar 2019 18:58:53 +0100
mod_csi_simple: Count buffered items and flush when it reaches configured limit Kim Alvefur Sun, 24 Mar 2019 18:33:38 +0100
mod_csi_simple: Break out stanza timestamping into a function for future reuse Kim Alvefur Sun, 24 Mar 2019 18:32:50 +0100
mod_c2s: Fire an event when outgoing buffers have been emptied Kim Alvefur Sun, 24 Mar 2019 18:30:51 +0100
mod_csi_simple: Use write locks in net.server if available Kim Alvefur Sat, 24 Nov 2018 02:25:44 +0100
sessionmanager: Split byte-level sending into separate session.rawsend Kim Alvefur Sun, 24 Mar 2019 08:18:19 +0000
util.x509: Add function that extracts usable names from a certificate Kim Alvefur Fri, 04 Jan 2019 10:20:51 +0100
mod_storage_memory: Fix copypaste mistake Kim Alvefur Sat, 23 Mar 2019 22:05:42 +0100
mod_storage_memory: Implement archive summary API Kim Alvefur Sat, 23 Mar 2019 22:05:08 +0100
mod_storage_sql: Implement archive summary API Kim Alvefur Mon, 25 Feb 2019 15:51:55 +0100
mod_storage_internal: Implement a summary API returning message counts per contact Kim Alvefur Mon, 25 Feb 2019 15:48:28 +0100
util.queue: Update :items() to consistently use private data directly Matthew Wild Sat, 23 Mar 2019 08:52:57 +0000
util.queue: Add 'consume()' convenience iterator Matthew Wild Sat, 23 Mar 2019 08:47:55 +0000
doc/coding_style: The codebase uses semicolons Kim Alvefur Sat, 23 Mar 2019 04:00:55 +0100
doc/coding_style: Trim trailing whitespace Kim Alvefur Sat, 23 Mar 2019 03:56:55 +0100
doc/coding_style: remove superfulous bracket in example Maxime “pep” Buquet Sat, 23 Mar 2019 02:27:45 +0000
net/server_event: fix typo in comment Maxime “pep” Buquet Sat, 23 Mar 2019 01:57:12 +0000
mod_storage_sql: No archive item limit by default Kim Alvefur Fri, 22 Mar 2019 16:30:53 +0100
mod_storage_internal: Include store name when reporting quota status Kim Alvefur Fri, 22 Mar 2019 02:24:48 +0100
mod_mam: On quota hit, separately delete by time and by item count Kim Alvefur Fri, 22 Mar 2019 02:22:21 +0100
mod_storage_sql: Return cached count if only this is queried for Kim Alvefur Fri, 22 Mar 2019 02:18:54 +0100
mod_storage_sql: Cache total count if it's calculated as part of the current query Kim Alvefur Fri, 22 Mar 2019 02:13:27 +0100
mod_storage_sql: Skip cache write Kim Alvefur Fri, 22 Mar 2019 02:12:02 +0100
mod_storage_sql: Fix to use currently queried store Kim Alvefur Fri, 22 Mar 2019 02:10:46 +0100
mod_storage_sql: Don't increment counter twice (fixes accounting error) Kim Alvefur Fri, 22 Mar 2019 02:09:38 +0100
mod_storage_internal: Increase default quota to 10 000 Kim Alvefur Fri, 22 Mar 2019 02:04:34 +0100
mod_storage_memory: Add support for archive item limits Kim Alvefur Wed, 20 Mar 2019 12:14:45 +0100
mod_mam: Trim archive when quota has been exceeded Kim Alvefur Tue, 07 Nov 2017 18:58:52 +0100
mod_storage_internal,_sql: Key item count cache on both username and store Kim Alvefur Fri, 22 Mar 2019 18:02:27 +0100
mod_storage_internal,_sql: Expose archive capabilities feature set Kim Alvefur Fri, 22 Mar 2019 18:01:24 +0100
mod_storage_internal,_sql: Add limit to number of items in an archive store (fixes #733) Matthew Wild Fri, 20 Oct 2017 12:53:53 +0200
Merge 0.11->trunk Kim Alvefur Fri, 22 Mar 2019 17:58:08 +0100