Henry Jameson 2faac1cc48 Merge remote-tracking branch 'origin/develop' into shigusegubu ... * origin/develop: (36 commits) [#570] add user:notification stream fix for new instances no print version to the shell OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f and this leftover artifact breaks compiling now. Update Phoenix to 1.4.8 Apply suggestion to CHANGELOG.md Documentation: Document chat token response. Changelog: Document chat token. Mastodon API: Return the token needed for the chat. bugfix little fix version generation it is changed in compile time Fix rate limit test [#948] /api/v1/account_search added optional parameters (limit, offset, following) Fix hashtags being picked up by rich media parser Add copyright info to containment.ex Mastodon API: Document changes. MastodonAPI: Add a way to update the background image. Improve rate limiter documentation ...		2019-06-16 14:25:39 +03:00
..
config.exs	Merge remote-tracking branch 'origin/develop' into shigusegubu	2019-06-16 14:25:39 +03:00
custom_emoji.txt	updates	2019-04-28 18:32:58 +03:00
dev.exs	it is changed in compile time	2019-06-14 15:45:05 +00:00
dokku.exs	CI: Add auto-deployment via dokku.	2019-05-31 10:55:35 +02:00
emoji.txt	Adding tag to emoji ets table	2019-04-01 17:17:57 +07:00
prod.exs	it is changed in compile time	2019-06-14 15:45:05 +00:00
releases.exs	Set instance static/uploads to be outside of application directory in release config	2019-06-14 01:42:56 +03:00
test.exs	Fix rate limit test	2019-06-14 19:24:31 +07:00