lain 050c4b1f14 Merge branch 'bugfix/peertube-mpegURL-object' into 'develop' ... Video: Handle peertube videos only stashing attachments in x-mpegURL Closes #2372 and #2535 See merge request pleroma/pleroma!3336		2021-02-28 16:18:23 +00:00
..
mix	Merge branch 'ecto-rollback-in-test-env' into 'develop'	2021-02-26 16:47:53 +00:00
phoenix/transports/web_socket	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
pleroma	Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'	2021-02-28 16:18:23 +00:00