mirrors/akkoma
1
0
Fork 1
mirror of https://github.com/jtomchak/akkoma.git synced 2025-03-19 01:20:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
akkoma/lib
History
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses 
# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
..
mix Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-01 20:08:14 +03:00
pleroma Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses 2020-04-02 19:38:39 +03:00
jason_types.ex Update Copyrights 2020-03-03 16:44:49 -06:00
transports.ex Update Copyrights 2020-03-03 16:44:49 -06:00
xml_builder.ex Update Copyrights 2020-03-03 16:44:49 -06:00