about summary refs log tree commit diff
path: root/ExampleBots
diff options
context:
space:
mode:
authorEmma [it/its]@Rory& <root@rory.gay>2024-03-22 17:45:19 +0100
committerEmma [it/its]@Rory& <root@rory.gay>2024-03-22 17:45:19 +0100
commitfc3d89ad7422dedb8763783c6ebb5d70fcc2c536 (patch)
treed46e22858059b76e8968704926d8f4685853be30 /ExampleBots
parentChanges (diff)
downloadLibMatrix-fc3d89ad7422dedb8763783c6ebb5d70fcc2c536.tar.xz
Fix merge conficts between machines
Diffstat (limited to '')
m---------ExampleBots/ModerationBot0
m---------ExampleBots/PluralContactBotPoC0
2 files changed, 0 insertions, 0 deletions
diff --git a/ExampleBots/ModerationBot b/ExampleBots/ModerationBot
-Subproject 8579db2c9099630b6a268015d586db73435032f
+Subproject c137f94aeb122c636629fb9361dd73626594f69
diff --git a/ExampleBots/PluralContactBotPoC b/ExampleBots/PluralContactBotPoC
-Subproject 7ef0970090c1525a60063c0ba7c0a4bd9fd8cc2
+Subproject 4072e5922b671c9d93dbf9727123046054ca6da