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
..
js	Bundled output for commit 4b126d9f4c	2023-11-11 18:46:13 +00:00
locale	feat: revamp search (#3893)	2023-11-11 19:43:09 +01:00
migrations	chore(deps): bump glob-parent from 3.1.0 to 5.1.2 in /extensions/emoji/js (#3345)	2022-03-11 18:11:20 -05:00
src	Apply fixes from StyleCI	2024-03-08 13:41:35 +00:00
tests	Merge branch 'refs/heads/2.x' into sm/json-api-server	2024-05-09 13:19:14 +01:00
.gitattributes	chore: add .gitattributes to extensions to export-ignore files. (#3513)	2022-07-08 20:38:20 +01:00
.gitignore	chore: flarum-cli audit infra --fix	2022-01-20 03:47:04 -05:00
CHANGELOG.md	Release v1.2	2022-01-20 12:10:11 +01:00
composer.json	fix(regression): require flarum/testing:2.0	2023-05-31 09:53:59 +01:00
extend.php	Apply fixes from StyleCI	2024-03-08 13:41:35 +00:00
LICENSE	Update copyright year	2021-05-15 00:56:32 +01:00