tusooa fdc71f6051 Merge branch 'short-description' into 'develop' ... Add short_description instance field Closes #2865 See merge request pleroma/pleroma!3651		2022-07-13 04:42:24 +00:00
..
controllers	Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'	2022-07-03 20:58:20 +00:00
views	Merge branch 'short-description' into 'develop'	2022-07-13 04:42:24 +00:00
mastodon_api.ex	Copyright bump for 2022	2022-02-25 23:11:42 -07:00
websocket_handler.ex	Copyright bump for 2022	2022-02-25 23:11:42 -07:00