kolaente d272eb2a7a Merge branch 'main' into fix/upcoming ... # Conflicts: # src/views/tasks/ShowTasks.vue		2022-02-05 20:02:30 +01:00
..
list	Merge branch 'main' into fix/upcoming	2022-02-05 20:02:30 +01:00
misc	feat: move the calculation of the current salutation to a different function	2022-01-04 18:44:07 +00:00
sharing	Add translations (#562)	2021-06-23 23:24:57 +00:00
task	Merge branch 'main' into feature/vue3-modals-with-router-4	2022-01-18 21:47:17 +01:00
user	Merge branch 'main' into feature/login-improvements	2022-02-05 18:04:33 +01:00