Merge branch 'master' into manage-holidays

CHANGELOG.rst

aleksis/core/frontend/app/vuetify.js

.../frontend/components/calendar/BaseCalendarFeedDetails.vue

...frontend/components/calendar/BaseCalendarFeedEventBar.vue

.../core/frontend/components/calendar/CalendarControlBar.vue

...is/core/frontend/components/calendar/CalendarOverview.vue

aleksis/core/frontend/components/calendar/CalendarSelect.vue

.../core/frontend/components/calendar/CalendarTypeSelect.vue

...ontend/components/calendar/GenericCalendarFeedDetails.vue

...ore/frontend/components/calendar/calendarOverview.graphql

...re/frontend/components/calendar/setCalendarStatus.graphql

...is/core/frontend/components/holiday/HolidayInlineList.vue

aleksis/core/frontend/components/holiday/holiday.graphql

aleksis/core/frontend/messages/en.json

aleksis/core/frontend/mixins/calendarFeedDetails.js

aleksis/core/frontend/routes.js

aleksis/core/migrations/0050_fix_amends.py

aleksis/core/migrations/0051_calendarevent_and_holiday.py

aleksis/core/migrations/0051_calendarevent_dates.py

aleksis/core/migrations/0052_holiday.py