Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header' ... # Conflicts: # CHANGELOG.md		2019-06-23 03:25:50 +00:00
..
mix	Support RUM indexes in the config generator	2019-06-22 12:54:16 +03:00
pleroma	Merge branch 'develop' into 'remove-avatar-header'	2019-06-23 03:25:50 +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