Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus		2019-04-04 15:39:42 -05:00
..
config.exs	Merge branch 'develop' into feature/prometheus	2019-04-04 15:39:42 -05:00
dev.exs	config/dev.exs: Don’t put secure cookies on dev	2019-02-12 21:50:47 +01:00
emoji.txt
prod.exs
test.exs	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00