Merge branch 'Gargron-master'

2017-03-09 17:39:00 -05:00 · 2017-03-09 17:39:00 -05:00 · e43ddbcc70
commit e43ddbcc70
parent a439674253 ed262dfb2d
13 changed files with 51 additions and 35 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java
@ -55,7 +55,7 @@ public interface MastodonAPI {

    @Multipart
    @POST("api/v1/media")
-    Call<Media> uploadMedia(@Part("file") MultipartBody.Part file);
+    Call<Media> uploadMedia(@Part MultipartBody.Part file);

    @FormUrlEncoded
    @POST("api/v1/statuses")