kaniini 5fbb14f5ec Merge branch 'bugfix/federation-kroeg' into 'develop' ... fix federation with kroeg See merge request pleroma/pleroma!272		2018-08-16 15:20:15 +00:00
..
mix/tasks	Merge branch 'feature/invites' into 'develop'	2018-08-12 12:04:15 +00:00
pleroma	Merge branch 'bugfix/federation-kroeg' into 'develop'	2018-08-16 15:20:15 +00: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	Format the code.	2018-03-30 15:01:53 +02:00