Merge branch 'master' into feature/TT-12_datetime_picker_format
# Conflicts: # src/main/java/de/nilzbu/mytimetracker/ui/view/timeentry/TimeEntryFormConfigurer.java
This commit is contained in:
# Conflicts: # src/main/java/de/nilzbu/mytimetracker/ui/view/timeentry/TimeEntryFormConfigurer.java