David Yip
|
f4b2478af1
|
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
|
2018-01-28 22:45:17 -06:00 |
Eugen Rochko
|
97dcfb0f50
|
ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
|
2018-01-29 01:06:39 +01:00 |
Jenkins
|
0e10667fbe
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-01-24 19:17:11 +00:00 |
|
Eugen Rochko
|
b1daa71da5
|
Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)
|
2018-01-24 02:57:14 +01:00 |
|
David Yip
|
1253279feb
|
Merge remote-tracking branch 'origin/mas |