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
..
app	Merge branch 'master' into subpage	2017-08-14 18:30:58 +00:00
resources	Merge branch 'master' into subpage	2017-08-14 18:30:58 +00:00
.babelrc	Init new version	2016-10-10 10:57:39 +02:00
package.json	Implement watchlist feature (#84)	2017-07-31 09:21:44 +02:00
webpack.config.js	change settings page (#31)	2017-02-13 21:17:33 +01:00
yarn.lock	add language translations for flox	2016-11-23 21:16:41 +01:00