Tim Meier 2e94485a5e Merge branch 'master' into subpage ... Conflicts: README.md backend/app/Services/Storage.php backend/app/Services/TMDB.php client/app/config.js public/assets/app.js		2017-08-14 18:30:58 +00:00
..
languages	Merge branch 'master' into subpage	2017-08-14 18:30:58 +00:00
sass	Improve filter sort (#85)	2017-08-05 18:40:36 +02:00
app.blade.php	add browser titles (#70)	2017-04-11 15:46:19 +02:00