5 dots
6 dots
Merge branch 'feature/feature1' into develop
merge
todaloo...
Merge branch 'feature/feature2' into develop

Conflicts:
	kaesehoch/src/main/java/com/jooik/kaesehoch/frags/FragmentCheeseList.java