Merge remote-tracking branch 'upstream/develop' into patch-image-description
authorWim Vanderbauwhede <wim.vanderbauwhede@mail.be>
Thu, 14 Feb 2019 16:41:40 +0000 (16:41 +0000)
committerWim Vanderbauwhede <wim.vanderbauwhede@mail.be>
Thu, 14 Feb 2019 16:41:40 +0000 (16:41 +0000)
1  2 
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex

Simple merge