mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2025-05-14 05:18:54 +00:00
Code Issues Projects Releases Wiki Activity
pleroma/lib/pleroma/instances
History
Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy 
# Conflicts:
#	lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
..
instance.ex Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy 2020-09-11 17:19:58 +03:00