kaniini 3dc5f04976 Merge branch 'carrot-bullying' into 'develop' ... Add some hard limits on inserted activities. See merge request pleroma/pleroma!595		2018-12-29 11:46:06 +00:00
..
config.exs	Merge branch 'carrot-bullying' into 'develop'	2018-12-29 11:46:06 +00:00
dev.exs
emoji.txt
prod.exs
test.exs	Merge branch 'captcha' into 'develop'	2018-12-17 19:45:14 +00:00