mirrors/akkoma
1
0
Fork 1
mirror of https://github.com/jtomchak/akkoma.git synced 2025-01-19 06:06:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
akkoma/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