kaniini 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop' ... AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924		2019-11-03 16:19:27 +00:00
..
mix	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
pleroma	Merge branch 'feature/omit-relay-user' into 'develop'	2019-11-03 16:19:27 +00:00
jason_types.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
transports.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
xml_builder.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00