Pierre Rudloff 3fff849ea8 Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext ... Conflicts: composer.json composer.lock templates/index.tpl templates/video.tpl		2017-05-29 19:01:20 +02:00
..
footer.tpl	Finish preparing pot file	2017-05-26 03:58:48 -07:00
head.tpl	Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext	2017-05-29 19:01:20 +02:00
header.tpl	Finish preparing pot file	2017-05-26 03:58:48 -07:00
logo.tpl	Use middleware instead of the noscheme workaround in order to make HTTPS work behind a reverse-proxy	2017-05-14 22:24:39 +02:00