Alex S 7410aee886 Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs		2019-04-06 20:34:00 +07:00
..
config.exs	Merge develop to 770-add-emoji-tags	2019-04-06 20:34:00 +07:00
dev.exs	config/dev.exs: Don’t put secure cookies on dev	2019-02-12 21:50:47 +01:00
emoji.txt	Adding tag to emoji ets table	2019-04-01 17:17:57 +07:00
prod.exs	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	2018-12-12 17:02:41 +03:00
test.exs	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00