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
..
inc	Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext	2017-05-29 19:01:20 +02:00
Translations	Name Correction	2017-05-26 11:45:05 -07:00
error.tpl	Finish preparing pot file	2017-05-26 03:58:48 -07:00
extractors.tpl	Finish preparing pot file	2017-05-26 03:58:48 -07:00
index.tpl	Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext	2017-05-29 19:01:20 +02:00
password.tpl	Finish preparing pot file	2017-05-26 03:58:48 -07:00
playlist.tpl	Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext	2017-05-29 19:01:20 +02:00
video.tpl	Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext	2017-05-29 19:01:20 +02:00