Sami Mazouz caaaadd701 Merge branch 'refs/heads/2.x' into sm/json-api-server ... # Conflicts: # extensions/likes/tests/integration/api/ListPostsTest.php # extensions/mentions/tests/integration/api/ListPostsTest.php # framework/core/src/Api/routes.php # framework/core/src/Discussion/UserState.php # framework/core/src/Extend/Settings.php # framework/core/tests/integration/extenders/ApiControllerTest.php # framework/core/tests/integration/extenders/ModelTest.php # framework/core/tests/integration/policy/DiscussionPolicyTest.php		2024-05-09 13:19:14 +01:00
..
api	Merge branch 'refs/heads/2.x' into sm/json-api-server	2024-05-09 13:19:14 +01:00
setup.php	chore: improve test suite (#3814)	2023-06-15 13:26:39 +01:00