Alex Gleason 45f68d3f85 Merge remote-tracking branch 'origin/develop' into asdf		2021-05-16 16:46:25 -05: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	Rich media: have invalid Rich/Video fall back to Link	2021-05-13 14:22:50 -05:00
instance_static	support for special chars in pack name	2020-09-24 09:12:37 +03:00
mix	Simplify `mix pleroma.instance gen` task	2021-05-16 16:46:21 -05:00
pleroma	Merge remote-tracking branch 'origin/develop' into link-fixes	2021-05-13 14:35:19 -05:00
support	Video: Handle peertube videos only stashing attachments in x-mpegURL	2021-02-21 23:41:28 +01:00
test_helper.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00