Haelwenn 0eb7464c10 Merge branch 'emoji-loader-fix' into 'develop' ...

Emoji: Don't die when files are present in the emoji folder.

Closes #957

See merge request pleroma/pleroma!1245

2019-06-04 11:26:42 +00:00

..

mix/tasks

Disable timeouts for object pruning query

2019-05-22 20:10:52 +03:00

pleroma

Merge branch 'emoji-loader-fix' into 'develop'

2019-06-04 11:26:42 +00:00

healthcheck.ex

Use Pleroma.Config everywhere

2019-05-30 15:33:58 +07:00

jason_types.ex

Format the code.

2018-03-30 15:01:53 +02:00

transports.ex

Format the code.

2018-03-30 15:01:53 +02:00

xml_builder.ex

xml builder: properly escape quotes

2019-05-12 19:04:37 +00:00