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
..
assets	Merge branch 'master' into subpage	2017-08-14 18:30:58 +00:00
exports	change user settings and add movie export	2016-10-10 15:14:57 +02:00
.htaccess	Init new version	2016-10-10 10:57:39 +02:00
index.php	Init new version	2016-10-10 10:57:39 +02:00
web.config	add web.config	2016-10-12 09:52:53 +02:00