Merge branch 'master' into dev

This commit is contained in:
Jannik 2017-03-05 18:36:43 +01:00 committed by GitHub
commit 01372c6ad3
1 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,8 @@
# Project-HomeFlix
Project HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI.
This is the dec branch please commit all changes her.
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