Merge branch 'master' into develop

2017-12-12 13:19:07 +01:00
parent e98f573732 871b98c06b
commit cafed8ce8f
63 changed files with 1588 additions and 209 deletions
@@ -26,6 +26,7 @@ func RenderToPng(c *middleware.Context) {
 		UserId:   c.UserId,
 		OrgRole:  c.OrgRole,
 		Timezone: queryReader.Get("tz", ""),
+		Encoding: queryReader.Get("encoding", ""),
 	}

 	pngPath, err := renderer.RenderToPng(renderOpts)