Francis Dinh 1afd6d37bd Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow ...

Fixed some conflicts in transmogrifier.ex

2018-05-20 19:17:15 -04:00

..

mix/tasks

Merge branch 'feature/remote-user-deactivation' into 'develop'

2018-05-19 09:30:09 +00:00

pleroma

Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow

2018-05-20 19:17:15 -04:00

jason_types.ex

…

transports.ex

…

xml_builder.ex

…