Mark Felder 0feafcc20c Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE		2021-04-09 10:30:27 -05:00
..
controllers	Merge branch 'update_open_api_spex' into 'develop'	2021-03-16 01:54:43 +00:00
views	Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE	2021-04-09 10:30:27 -05:00
mastodon_api.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
websocket_handler.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00