Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
authorTristan Mahé <gled@remote-shell.net>
Fri, 20 Jul 2018 00:44:18 +0000 (17:44 -0700)
committerTristan Mahé <gled@remote-shell.net>
Fri, 20 Jul 2018 00:44:18 +0000 (17:44 -0700)
commitbc2668bb63aee2c42cdea48782ba5ef291c17b45
tree838d334208c4dadf23b974181c0ad4c17b199f8c
parent5469fb9561bb886deb8434e545dfb711eb20f341
parent41b0ecef959df0a1cda71e56e256cacebe48d56f
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
config/config.exs
lib/pleroma/upload.ex