From b8a4727c938473083d0453e2622f296724595e70 Mon Sep 17 00:00:00 2001 From: Jannik Date: Tue, 3 Jan 2017 23:39:14 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e96c038..7575619 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Project-HomeFlix Project HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI. +This is the master branch, it is **only merged** with dev if a **new release** is out. Librarys used in this Project: JFoenix: https://github.com/jfoenixadmin/JFoenix From d736e2eef08cef634bb573789ad92d864ad847ee Mon Sep 17 00:00:00 2001 From: Jannik Date: Fri, 13 Jan 2017 18:31:53 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7575619..eaa0cf9 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,5 @@ sqlite-jdbc: https://github.com/xerial/sqlite-jdbc [wiki](https://github.com/Seil0/Project-HomeFlix/wiki) -Project HomeFlix © 2016 Software Development Kellerkinder (SDK) +Project HomeFlix © 2016-2017 Software Development Kellerkinder (SDK) www.kellerkinder.xyz