Merge branch 'master' into indev

This commit is contained in:
Schuyler Cebulskie 2016-10-10 02:45:10 -04:00
commit 9230b8866b

View file

@ -48,7 +48,7 @@ class MessageAttachment {
* The Proxy URL to this attachment
* @type {string}
*/
this.proxyURL = data.url;
this.proxyURL = data.proxy_url;
/**
* The height of this attachment (if an image)