Merge branch 'master' into devel_xmpp

Merge pull request 'Adding "What's Matrix"' (#16 ) from devel_matrix into master
Reviewed-on: #16
2021-10-21 13:23:32 +02:00 · 2021-10-21 13:23:02 +02:00 · 2021-09-22 18:04:21 +02:00 · 2021-09-22 17:53:21 +02:00 · 2021-08-25 22:01:43 +02:00
1 changed files with 1 additions and 0 deletions
--- a/matrix.html
+++ b/matrix.html
@ -19,6 +19,7 @@
 </pre>
 <h3>Matrix</h3>
 <pre>
 <a href="https://matrix.org/">What's Matrix (official Website)</a>
 Connection Details:
 ===================
Author	SHA1	Message	Date
Pratyush Desai	8b082bf11f	Merge branch 'master' into devel_xmpp	2021-10-21 13:23:32 +02:00
Pratyush Desai	5fbbeb61f5	Merge pull request 'Adding "What's Matrix"' (#16 ) from devel_matrix into master Reviewed-on: #16	2021-10-21 13:23:02 +02:00
Georg Pfuetzenreuter	997eff097f	Merge branch 'master' into devel_matrix	2021-09-22 18:04:21 +02:00
Georg	275d5a6d2b	Adding \"What's Matrix\" Signed-off-by: Georg <georg@lysergic.dev>	2021-09-22 17:53:21 +02:00
Georg Pfuetzenreuter	df9eab5359	Merge pull request 'XMPP compliance badge' (#15 ) from devel_xmpp into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #15	2021-08-25 22:01:43 +02:00