Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ...

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex

2019-02-04 20:50:28 +07:00

..

config.exs

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

2019-02-04 20:50:28 +07:00

dev.exs

Enable unsecure cookies by default in dev.exs

2018-12-16 08:49:23 +01:00

emoji.txt

Revert renaming emoji.txt

2018-01-31 23:47:42 +02: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

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

2019-02-04 20:50:28 +07:00