6 Commits

Author	SHA1	Message	Date
Benjamin Peterson	b57eaeadff	merge 3.4 (#26172)	2016-01-20 22:02:47 -08:00
Benjamin Peterson	c836f717cd	remove script from epub (closes #26172)	2016-01-20 22:02:30 -08:00
Georg Brandl	cadc3fdcb5	Merge with 3.4	2014-10-29 08:37:29 +01:00
Georg Brandl	46761ec7c2	Use https:// URLs in the HTML templates.	2014-10-29 08:36:15 +01:00
Georg Brandl	76c49a2fb9	merge with 3.4	2014-10-29 08:11:55 +01:00
Georg Brandl	a1f8486325	Move HTML templates to their own subdir.	2014-10-29 08:11:46 +01:00