Alex Gleason d7cbaedc86 Merge branch 'fix-attachments' into 'develop' ... StatusController: deleting a status returns the original media IDs See merge request soapbox-pub/soapbox-be!114		2022-03-17 18:58:19 +00:00
..
config	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
credo/check/consistency	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
fixtures	Support account location field	2022-03-14 22:41:33 +01:00
instance_static	support for special chars in pack name	2020-09-24 09:12:37 +03:00
mix	Merge tag 'v2.4.0' into pleroma-v2.4.0	2021-08-08 10:46:48 -05:00
pleroma	Merge branch 'fix-attachments' into 'develop'	2022-03-17 18:58:19 +00:00
support	Merge remote-tracking branch 'tusooa/from/develop/tusooa/emit-move' into emit-move	2022-02-13 23:18:55 +01:00
test_helper.exs	Skip erratic tests	2021-12-21 22:04:15 -06:00