Merge remote-tracking branch 'upstream/develop' into fetch-usage
authorMichael <heluecht@pirati.ca>
Sat, 19 Mar 2022 11:21:38 +0000 (11:21 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 19 Mar 2022 11:21:38 +0000 (11:21 +0000)
commit4e45987f74ccbe61a53c711317c2e45894435ece
tree22b769b57669cd3fe2ce2abcabcd30e8ff56411f
parentcda348def2596385f0c716c6cc2920a6684e95c5
parent4329f5381b73a90ba1b3649f7fa8f1576ed0e749
Merge remote-tracking branch 'upstream/develop' into fetch-usage
src/Module/Admin/Federation.php
view/lang/C/messages.po