Louis Vézina 05ec091f69 Merge branch 'development' into morpheus ... # Conflicts: # bazarr/get_subtitle.py # bazarr/list_subtitles.py # views/movie.tpl		2019-04-25 22:18:13 -04:00
..
episodes.tpl	Merge branch 'development' into morpheus	2019-04-25 22:18:13 -04:00
footer.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
history.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
historymovies.tpl	Fix for subtitles upgrading when a series doesn't have a desired language anymore.	2019-04-23 20:05:06 -04:00
historyseries.tpl	Fix for subtitles upgrading when a series doesn't have a desired language anymore.	2019-04-23 20:05:06 -04:00
login.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
logs.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
menu.tpl	Merge branch 'halali' into development	2019-04-22 21:13:37 -04:00
movie.tpl	Merge branch 'development' into morpheus	2019-04-25 22:18:13 -04:00
movies.tpl	Merge branch 'development' into morpheus	2019-04-25 22:18:13 -04:00
movieseditor.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
series.tpl	Merge branch 'development' into morpheus	2019-04-25 22:18:13 -04:00
serieseditor.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
settings.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
system.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
wanted.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
wantedmovies.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
wantedseries.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00
wizard.tpl	Continuing work on mobile UI.	2019-04-20 17:15:00 -04:00