lain 2b71f4897f Merge branch 'develop' into 'bookmark-folders' ... # Conflicts: # docs/development/API/differences_in_mastoapi_responses.md		2024-03-18 10:35:02 +00:00
..
config	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
credo/check/consistency	Revert "Merge branch 'copyright-bump' into 'develop'"	2023-01-02 20:38:50 +00:00
fixtures	Merge branch 'public-polls' into 'develop'	2024-03-18 06:26:22 +00:00
instance_static	support for special chars in pack name	2020-09-24 09:12:37 +03:00
mix	ConfigDB export to file does not have a consistent order.	2023-12-29 23:18:45 -05:00
pleroma	Merge branch 'develop' into 'bookmark-folders'	2024-03-18 10:35:02 +00:00
support	Merge remote-tracking branch 'origin/develop' into HEAD	2024-02-22 21:05:20 +01:00
test_helper.exs	Skip tests on MacOS/Darwin that have always failed	2024-01-15 20:18:43 -05:00