Resolve conflit between Tchap and Element Web 1.11.25#475
Merged
odelcroi merged 29 commits intoupgrade/element-web-v1.11.25from upgrade/element-web-v1.11.25-resolv-conflictMar 20, 2023
+413-2,688
Commits
Commits on Mar 17, 2023
Commits on Mar 19, 2023
- committed
- committed
- committed
Commits on Mar 20, 2023
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Merge branch 'upgrade/element-web-v1.11.25-resolv-conflict' of https://github.com/tchapgouv/tchap-web-v4 into upgrade/element-web-v1.11.25-resolv-conflict
committed- committed
- committed
- committed
- committed
- committed
