squidfunk
bc9cdb5774
Merge branch 'master' of github.com:squidfunk/mkdocs-material
2023-09-30 11:33:17 +02:00
squidfunk
4743c1bab6
Fixed occasional flashes when using instant loading
2023-09-30 11:33:09 +02:00
Alexander Voss
1be39328ac
Fixed encoding problem when using blog plugin ( #6103 )
2023-09-29 15:26:32 +02:00
squidfunk
cef79862a2
Added distribution files
2023-09-29 12:21:00 +02:00
Alex Voss
d144a1c1f6
neglected to check in built version of shortcodes.py
2023-09-28 17:37:31 +02:00
squidfunk
305c33622c
Improved spacing and alignment of tags
2023-09-25 10:56:13 +02:00
squidfunk
0e2759666d
Prepare 9.4.2 release
2023-09-25 09:49:06 +02:00
squidfunk
0e104c1420
Updated dependencies
2023-09-25 09:13:35 +02:00
squidfunk
59d3b3395d
Improved extension compatibility with Python 3.8
2023-09-24 17:50:57 +02:00
squidfunk
639dbacc63
Added support for auto-replacement of meta tags when using instant loading
2023-09-24 17:16:50 +02:00
squidfunk
15538b0a39
Merge branch 'master' into fix/instant-loading
2023-09-23 16:48:31 +02:00
squidfunk
7e6f15bb17
Fixed ignored repeated anchor link clicks when using instant loading
2023-09-23 16:32:44 +02:00
squidfunk
ef30cfea67
Added Slovenian translations
...
Co-authored-by: dkalsan <25985498+dkalsan@users.noreply.github.com>
2023-09-23 15:39:06 +02:00
squidfunk
e08d0471e9
Stretch outline of navigation section
2023-09-23 15:38:05 +02:00
squidfunk
8a1244e74a
Fixed integrated table of contents
2023-09-23 14:55:49 +02:00
squidfunk
3fbcb3ed83
Fixed blog sidebar navigation
2023-09-23 14:41:44 +02:00
squidfunk
521f7272ee
Fixed navigation outlines on focus
2023-09-23 13:50:10 +02:00
squidfunk
9dd7511b65
Fixed linter errors
2023-09-23 09:46:11 +02:00
squidfunk
3baf74f1b9
Fixed navigation sections being hidden
2023-09-23 09:40:50 +02:00
squidfunk
e6f9b0fc34
Updated distribution files
2023-09-23 09:32:20 +02:00
squidfunk
159b28cd64
Test direct GitHub Pages deployment
2023-09-22 19:30:57 +02:00
squidfunk
188d395ac7
Test direct GitHub Pages deployment
2023-09-22 19:22:21 +02:00
squidfunk
a3b619fc4b
Merge branch 'master' into fix/instant-loading
2023-09-22 18:17:17 +02:00
squidfunk
433c137bc1
Fixed blog plugin not generating paginated views as index pages
2023-09-22 18:12:48 +02:00
squidfunk
7d0f759cfb
Removed hack in blog plugin for MkDocs < 1.5.3
2023-09-22 17:58:26 +02:00
squidfunk
50c273cfd4
Fixed blog plugin crashing when blog is not linked in navigation
2023-09-22 17:28:57 +02:00
squidfunk
530c86bd14
Prepare 9.4.1 release
2023-09-22 14:12:33 +02:00
squidfunk
5deec283a0
Switched content tabs to neutral color
2023-09-22 14:00:40 +02:00
squidfunk
c9e4a5e265
Improved colors and contrast in dark mode
2023-09-22 13:33:40 +02:00
squidfunk
a0cc06b112
Prepare 9.4.0 release
2023-09-21 18:56:35 +02:00
squidfunk
859b8bcaee
Improved slate color scheme
2023-09-21 17:23:36 +02:00
squidfunk
970670bb4a
Improved slate color scheme
2023-09-21 16:06:55 +02:00
squidfunk
f4e4d71343
Updated issue templates
2023-09-21 15:33:49 +02:00
squidfunk
c476842334
Merge branch 'master' into docs/guides
2023-09-21 14:53:33 +02:00
squidfunk
1205411f22
Added version info to entrypoint
2023-09-20 17:59:51 +02:00
squidfunk
00c5fb1766
Added emoji extension
2023-09-20 17:33:29 +02:00
squidfunk
916e30c877
Added distribution files
2023-09-20 15:01:13 +02:00
squidfunk
1a102a0f7f
Fixed asset URLs after restructuring
2023-09-20 14:26:05 +02:00
squidfunk
56b96b4d79
Restructured project
2023-09-20 13:58:03 +02:00
squidfunk
438fa201cd
Updated shortcodes hook
2023-09-19 18:47:39 +02:00
squidfunk
11cb733741
Added badges to view and download examples
2023-09-19 17:16:41 +02:00
squidfunk
52d32253d8
Added Belarusian translations
...
Co-authored-by: mvkarpuk <102862963+mvkarpuk@users.noreply.github.com>
2023-09-19 16:19:08 +02:00
squidfunk
42b2fb8945
Prepare 9.3.2 release
2023-09-19 09:01:52 +02:00
squidfunk
432ba9e030
Updated Slovenian translations
...
Co-authored-by: dkalsan <25985498+dkalsan@users.noreply.github.com>
2023-09-19 08:46:34 +02:00
squidfunk
e865a1b40f
Updated distribution files
2023-09-18 20:06:34 +02:00
squidfunk
9f28058613
Updated dependencies
2023-09-18 20:01:13 +02:00
squidfunk
fc45f52336
Added first example to documentation
2023-09-18 19:36:02 +02:00
Martin Donath
cd008fdf29
Restructured documentation ( #5692 )
2023-09-14 19:09:18 +02:00
squidfunk
19437db8fc
Updated dependencies
2023-09-14 11:05:14 +02:00
squidfunk
ef5a04a324
Fixed draft blog posts being included in navigation
2023-09-13 22:05:53 +02:00
squidfunk
bfe19b16d1
Prepare 9.3.1 release
2023-09-11 18:20:26 +02:00
squidfunk
eb1c32327b
Fixed group plugin crashing when using hooks
2023-09-11 18:17:41 +02:00
squidfunk
c9a7339411
Updated dependencies
2023-09-11 17:48:11 +02:00
squidfunk
3a352743e5
Prepare 9.3.0 release
2023-09-11 17:18:58 +02:00
squidfunk
2e85464401
Improved error message in group plugin
2023-09-11 17:08:28 +02:00
squidfunk
4154a94956
Added experimental group plugin
2023-09-11 16:20:33 +02:00
squidfunk
2ba35383e2
Removed tags settings only available in Insiders from schema
2023-09-10 16:32:06 +02:00
squidfunk
e3d5fd2eb3
Added missing tags setting in tags plugin
2023-09-10 15:56:53 +02:00
squidfunk
86d52b93cd
Prepare 9.2.8 release
2023-09-04 21:36:12 +02:00
squidfunk
fc566cf0e2
Fixed further regression in blog plugin navigation
2023-09-04 14:06:51 +02:00
squidfunk
682d1761e7
Fixed further regression in blog plugin navigation
2023-09-04 09:53:43 +02:00
squidfunk
752aa5ce88
Updated translations
2023-09-03 12:59:20 +02:00
squidfunk
12f866ddf5
Updated dependencies
2023-09-03 12:58:48 +02:00
squidfunk
d2962d9551
Documentation
2023-09-03 12:55:11 +02:00
squidfunk
84cb91b21b
Fixed incorrect URLs when rendering paginated views
2023-09-03 12:48:46 +02:00
squidfunk
7bdd03a794
Fixed missing titles in views when blog posts have no h1 headings
2023-09-03 11:00:13 +02:00
squidfunk
3f87fe0f5b
Fixed linking of blog posts in navigation (temporary hack)
2023-09-03 09:29:40 +02:00
squidfunk
dc4b3a5b10
Prepare 9.2.7 release
2023-09-02 19:05:37 +02:00
squidfunk
c9b3d435f2
Merge branch 'master' of github.com:squidfunk/mkdocs-material
2023-09-02 19:02:50 +02:00
squidfunk
bca4b1f8b1
Rebuild stylesheets
2023-09-02 19:02:05 +02:00
Sigurd Spieckermann
ea53f53982
Added CSS variables for Mermaid sequence diagrams ( #5940 )
...
* Add CSS variables for Mermaid sequence diagram note
* Add CSS variables for Mermaid sequence diagram actor
* Add CSS variables for Mermaid sequence diagram message
* Add CSS variables for Mermaid sequence diagram actor man
* Add CSS variables for Mermaid sequence diagram loop
* Add CSS variables for Mermaid sequence diagram number
* Add CSS variables for Mermaid sequence diagram box
---------
Co-authored-by: Martin Donath <martin.donath@squidfunk.com>
2023-09-02 18:58:13 +02:00
Sigurd Spieckermann
ec709b4f0e
Fixed rendering issue for rotated annotation icons in Firefox ( #5937 )
...
Co-authored-by: Martin Donath <martin.donath@squidfunk.com>
2023-09-02 18:51:49 +02:00
squidfunk
3eb1887f6b
Fixed linter errors
2023-09-02 18:44:42 +02:00
squidfunk
e79ffab3ac
Fixed page scrolling up when switching color palettes in Firefox 117
2023-09-02 18:41:26 +02:00
squidfunk
a6033d1db6
Formatting
2023-09-02 18:13:55 +02:00
squidfunk
76a30ecab2
Fixed announcement bar dismissal when using instant loading
2023-09-02 16:39:05 +02:00
squidfunk
6e1c658a9d
Fixed footer links for blog sibling pages
2023-09-02 16:12:28 +02:00
squidfunk
64350569c9
Moved parser to own module
2023-08-31 11:31:15 +02:00
squidfunk
0d3cd8a433
Removed readtime and lxml dependencies
2023-08-31 11:13:06 +02:00
squidfunk
aabc68dd8f
Prepare 9.2.6 release
2023-08-31 09:22:25 +02:00
Sigurd Spieckermann
d0ac21e98d
Updated icon search index ( #5920 )
...
Updated icon search index
2023-08-30 18:15:56 +02:00
squidfunk
554049677d
Added Basque translations
...
Co-authored-by: Porrumentzio <61913683+Porrumentzio@users.noreply.github.com>
2023-08-30 18:06:28 +02:00
squidfunk
ad45cf36cb
Fixed social plugin checking dependencies albeit being disabled
2023-08-30 16:28:59 +02:00
squidfunk
f2512ded4a
Fixed blog plugin compatibility with Python < 3.9
2023-08-30 16:06:27 +02:00
squidfunk
4c6b004fe4
Refactored blog plugin view generation
2023-08-30 15:27:40 +02:00
squidfunk
8af68b691c
Added template for redirects
2023-08-27 14:21:04 +02:00
squidfunk
2e61932edd
Updated dependencies
2023-08-27 13:25:33 +02:00
squidfunk
ecdf33681a
Prepare 9.2.5 release
2023-08-27 13:03:47 +02:00
squidfunk
acd70cf04a
Fixed dirty rebuilds for blog plugin
2023-08-27 12:56:28 +02:00
squidfunk
568a5c8e1e
Fixed blog title not being consistent in pagination
2023-08-27 12:47:44 +02:00
squidfunk
da21786694
Documentation
2023-08-27 11:44:30 +02:00
squidfunk
fbb7a5e894
Blog plugin pagination breaks when disabling directory URLs
2023-08-27 11:42:11 +02:00
squidfunk
cafdc48a8a
Prepare 9.2.4 release
2023-08-26 13:59:23 +02:00
squidfunk
db568b1e6b
Added version to info plugin example name
2023-08-26 12:34:51 +02:00
squidfunk
6839f1cd97
Formatting
2023-08-23 16:02:43 +02:00
squidfunk
1b2ba4bcef
Formatting
2023-08-23 15:39:49 +02:00
squidfunk
92fc7f651f
Formatting
2023-08-23 15:15:11 +02:00
squidfunk
6a6d2d8edf
Refactored offline plugin
2023-08-23 15:00:05 +02:00
squidfunk
d9456543ca
Updated Afrikaans translations
...
Co-authored-by: spac3 <81820+spac3@users.noreply.github.com>
2023-08-23 11:29:22 +02:00
squidfunk
06e8ccd979
Formatting
2023-08-23 10:41:44 +02:00
squidfunk
e64a1e2603
Prepare 9.2.3 release
2023-08-22 17:11:18 +02:00
squidfunk
2d716453e0
Fixed generation of entrypoint in blog plugin
2023-08-22 16:47:54 +02:00
squidfunk
382101d8a3
Documentation
2023-08-22 15:41:30 +02:00
squidfunk
6ee9df6e1a
Fixed rendering in blog plugin with markdown.extensions.toc
2023-08-22 15:20:10 +02:00
squidfunk
fe47f40a06
Prepare 9.2.2 release
2023-08-22 14:44:34 +02:00
squidfunk
0704046536
Fixed compatibility with Python < 3.10
2023-08-22 11:22:56 +02:00
squidfunk
9f3efb8a59
Documentation
2023-08-22 07:59:36 +02:00
squidfunk
62d4a16067
Fixed edge cases for standalone case when using blog plugin
2023-08-22 07:56:33 +02:00
squidfunk
a0cb4a7230
Documentation
2023-08-21 23:50:49 +02:00
squidfunk
817caf0b61
Refactored blog plugin
2023-08-21 23:43:31 +02:00
squidfunk
83f7cfcae2
Prepare 9.2.1 release
2023-08-21 23:07:14 +02:00
squidfunk
7099ea60a9
Fixed several errors in blog plugin
2023-08-21 23:01:37 +02:00
squidfunk
a6f0bc4439
Added missing files
2023-08-21 19:19:10 +02:00
squidfunk
d1ffeb22eb
Prepare 9.2.0 release
2023-08-21 19:18:59 +02:00
squidfunk
4759c7aaaf
Fixed error when using git-revision-date-localized-plugin with blog
2023-08-21 18:23:00 +02:00
Sigurd Spieckermann
a6a37ab9d0
Moved header options to partials ( #5877 )
...
* Improved warning in social plugin about site_url
* Documentation
* Documentation
* Extract header options into partials
---------
Co-authored-by: squidfunk <martin.donath@squidfunk.com>
2023-08-21 18:08:46 +02:00
squidfunk
0de17c6197
Moved condition outside of tags partial
2023-08-21 18:06:46 +02:00
squidfunk
efdb146c30
Fixed linter errors
2023-08-21 17:56:11 +02:00
squidfunk
38b7282b20
Refactored blog plugin (+ other plugins)
2023-08-21 17:45:32 +02:00
squidfunk
1fa81d05f4
Merge branch 'master' into merge/piri-piri
2023-08-21 16:48:10 +02:00
squidfunk
8059f21915
Updated dependencies
2023-08-21 16:46:25 +02:00
squidfunk
914df5fe70
Improved warning in social plugin about site_url
2023-08-19 14:38:58 +02:00
squidfunk
052a7bcedf
Merge branch 'master' into merge/piri-piri
2023-08-19 14:22:25 +02:00
squidfunk
688c9de4c9
Updated Serbo-Croatian translations
...
Co-authored-by: MladenPuzic <11843073+MladenPuzic@users.noreply.github.com>
2023-08-19 14:20:23 +02:00
squidfunk
2cfe872a4c
Merge branch 'master' of github.com:squidfunk/mkdocs-material
2023-08-19 14:14:26 +02:00
squidfunk
245278b77a
Added Luxembourgish translations
...
Co-authored-by: IanToujou <44029196+IanToujou@users.noreply.github.com>
2023-08-19 14:14:13 +02:00
Sigurd Spieckermann
2dd6f64464
Use flex gaps instead of whitespaces between social icons
2023-08-17 11:33:18 +02:00
squidfunk
ccc3c444ed
Updated dependencies
2023-08-14 23:28:59 +02:00
squidfunk
d005e85cdb
Refactored offline plugin
2023-08-10 18:30:55 +02:00
squidfunk
554976f90f
Added prompt for bug report name to info plugin
2023-08-10 15:32:46 +02:00
squidfunk
50f455ec09
Automatically focus and bring up keyboard on touch devices
2023-08-10 14:40:26 +02:00
squidfunk
0be6172765
Switched info plugin to importlib to mitigate deprecations
2023-08-10 13:45:51 +02:00
squidfunk
15c024cbbf
Fixed draft blog posts appearing in tags index
2023-08-10 13:31:17 +02:00
squidfunk
04f1b33571
Merge branch 'master' into merge/piri-piri
2023-08-10 12:02:46 +02:00
squidfunk
7512e2e3ed
Updated dependencies
2023-08-07 13:34:37 +02:00
squidfunk
9141f2afc2
Prepare 9.2.0b3 release
2023-08-03 19:58:38 +02:00
squidfunk
5e64e92e23
Merge branch 'master' into fix/instant-loading
2023-08-01 19:28:09 +02:00
squidfunk
a4babcf37c
Improved dark mode link color for better accessibility
2023-08-01 19:21:51 +02:00
squidfunk
04bde62c91
Added support for adding update dates to blog posts
2023-08-01 19:10:11 +02:00
squidfunk
59604bd703
Updated dependencies
2023-08-01 13:26:45 +02:00
squidfunk
2e1ead03b0
Updated dependencies
2023-07-31 16:04:30 +02:00
squidfunk
98a009b02a
Prepare 9.1.21 release
2023-07-27 19:58:22 +02:00
squidfunk
cf7ca44fd3
Prepare 9.2.0b2 release
2023-07-27 09:53:37 +02:00
squidfunk
d7ffa27b40
Merge branch 'master' into merge/piri-piri
2023-07-27 09:52:14 +02:00
squidfunk
08ab76fd05
Prepare 9.1.20 release
2023-07-27 09:46:49 +02:00
squidfunk
eed928ea42
Merge branch 'master' into merge/piri-piri
2023-07-27 09:33:35 +02:00
Kamil Krzyśków
f548d79991
Updated social plugin to use theme.custom_dir
2023-07-25 19:27:48 +01:00
squidfunk
3e8faa0fdb
Updated dependencies
2023-07-24 13:13:23 +01:00
squidfunk
ab178b2bc2
Improve plugin inter-op with external tools like mike
2023-07-24 12:29:16 +01:00
squidfunk
405dfce64c
Improve support for instant loading with keyboard navigation
2023-07-22 11:44:18 +01:00
squidfunk
545fb27418
Prepare 9.1.19 release
2023-07-18 13:46:30 +01:00
squidfunk
ef448ed945
Fixed rendering of tags (9.2.0b0 regression)
2023-07-18 11:43:39 +01:00
squidfunk
be00c98742
Merge branch 'merge/piri-piri' of github.com:squidfunk/mkdocs-material into merge/piri-piri
2023-07-18 11:28:25 +01:00
squidfunk
eea21fb7e6
Prepare 9.2.0b1 release
2023-07-18 11:24:44 +01:00
squidfunk
e897b89125
Added support for MkDocs 1.5
...
Co-authored-by: oprypin <371383+oprypin@users.noreply.github.com>
2023-07-18 10:59:32 +01:00
squidfunk
4bb8926686
Updated dependencies
2023-07-18 10:53:44 +01:00
Olivier Robardet
56975d7a57
Fix french translation of 'readtime.other'
2023-07-13 17:36:19 +02:00
squidfunk
10b150112e
Improved error reporting in social plugin
2023-07-10 17:53:51 +01:00
squidfunk
5c211d023a
Merge branch 'master' into merge/piri-piri
2023-07-09 18:20:08 +01:00
squidfunk
b3ade9fd3a
Updated dependencies
2023-07-09 18:18:06 +01:00
squidfunk
3e34f6c72d
Added focus outline to admonitions and details
2023-07-09 18:14:43 +01:00
squidfunk
f64d8658d3
Added support for customizing (code) annotation icons
2023-07-07 11:15:52 +02:00
squidfunk
320c852565
Hide announcement bar button when JavaScript is not available
2023-07-07 10:31:41 +02:00
squidfunk
b37c668a9a
Removed necessity for Array.flat and Array.flatMap polyfill
2023-07-07 10:22:47 +02:00
squidfunk
54bef7bfe5
Automatically download ResizeObserver polyfill when necessary
2023-07-07 10:07:18 +02:00
squidfunk
083fab9ae8
Prepare 9.2.0b0 release
2023-07-06 16:41:28 +02:00
squidfunk
fb9c9f9486
Removed Universal Analytics integration (UA-XXXXXXXX-X)
2023-07-06 16:05:19 +02:00
Martin Donath
b2a20a2a11
Merge pull request #5281 from nejch/feat/all-icons-yaml
...
Allow overriding all HTML-inlined icons via yaml only
2023-07-06 15:53:50 +02:00
squidfunk
7ef079012b
Hoisted active state of navigation tabs link into item
2023-07-06 15:45:36 +02:00
squidfunk
e6f779933a
Merge branch 'merge/piri-piri' into refactor/polyfills
2023-07-06 13:38:30 +02:00
squidfunk
0f1e2de072
Merge branch 'master' into refactor/polyfills
2023-07-06 13:28:16 +02:00
squidfunk
bef6962ff2
Fixed linter errors
2023-07-06 13:15:17 +02:00
squidfunk
6b2f15f8e1
Fixed rendering bugs for pruned navigation items
2023-07-06 13:12:05 +02:00
squidfunk
ee9224fc07
Fixed errors after merge
2023-07-05 18:08:47 +02:00
squidfunk
1bee037713
Merge of features tied to 'Piri Piri' funding goal'
2023-07-05 17:39:33 +02:00
squidfunk
03d065ca20
Prepare 9.1.18 release
2023-07-03 12:28:04 +02:00
squidfunk
5a703c12e2
Updated dependencies
2023-07-03 12:22:12 +02:00
squidfunk
5dc5998031
Added Danish translations
...
Co-authored-by: Yacobolo <45033225+Yacobolo@users.noreply.github.com>
2023-07-02 13:03:06 +02:00
Hendrik
aff66f8d55
highlight seperator change npm build
2023-06-28 20:14:44 +00:00
squidfunk
9b0d2f7160
Updated dependencies
2023-06-26 13:33:19 +02:00
squidfunk
9c7ff74989
Prepare 9.1.17 release
2023-06-23 20:25:41 +02:00
squidfunk
d8a0e36ce3
Fixed regression in config deprecation in social plugin
2023-06-23 11:53:07 +02:00
squidfunk
3be797ece8
Fixed annotations with nested lists not being mounted correctly
2023-06-23 09:36:45 +02:00
squidfunk
057f40d5e9
Updated dependencies
2023-06-19 11:42:50 +02:00
squidfunk
bf28923c43
Prepare 9.1.16 release
2023-06-15 17:38:42 +02:00
squidfunk
e18fd7cce0
Updated dependencies
2023-06-15 17:35:07 +02:00
squidfunk
118904c216
Updated Indonesian translations
...
Co-authored-by: Abyanu163 <127492205+Abyanu163@users.noreply.github.com>
2023-06-07 16:34:20 +02:00
squidfunk
d2f403495c
Ensure color-scheme meta tag is set
2023-06-06 11:48:24 +02:00
squidfunk
530f84416e
Added support for using .mjs files in extra_javascript
2023-05-30 19:40:58 +02:00
squidfunk
06d1ba1337
Prepare 9.1.15 release
2023-05-29 17:42:40 +02:00
squidfunk
3d706407d9
Updated dependencies
2023-05-29 17:35:42 +02:00
squidfunk
fe0c966a4d
Added color-scheme property to indicate color scheme to OS
2023-05-27 17:41:00 +02:00
Martin Donath
263a85dbf5
Merge pull request #5536 from pawamoy/patch-6
...
Strip tags of ToC item's aria label
2023-05-22 18:31:06 +02:00
Timothée Mazzucotelli
3f978d86f6
Strip tags of ToC item's aria label
...
Some plugins/extensions might use the data-toc-label attribute
of headings to set a particular string for the ToC item title.
While not explicitly documented as possible or allowed,
they might set some HTML code instead of text.
In this case, the aria label of Toc nav elements break the HTML
as they will contain unescaped double quotes.
To fix this, we use the `striptags` filter
to remove any tags from the aria label, keeping text only.
2023-05-22 18:27:28 +02:00
squidfunk
ac7b96fb3d
Updated dependencies
2023-05-22 11:27:18 +02:00
squidfunk
d30fa86338
Prepare 9.1.14 release
2023-05-20 10:39:56 +02:00
squidfunk
168b8b8fda
Updated Armenian translations
...
Co-authored-by: cassmastern <49853998+cassmastern@users.noreply.github.com>
2023-05-20 10:31:50 +02:00
squidfunk
d10badb0b2
Updated Greek translations
...
Co-authored-by: geopolitis <2936134+geopolitis@users.noreply.github.com>
2023-05-17 10:37:42 +02:00
squidfunk
7e6ee58da7
Prepare 9.1.13 release
2023-05-16 20:16:33 +02:00
Chris Pointon
fdf8362d50
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# src/plugins/social/plugin.py
2023-05-15 11:05:40 +01:00