Merge calendar and subscription list#1551

georgehrke merged 1 commit intomasternextcloud/calendar:masterfrom

feature/noid/merge_calendar_subscription_listnextcloud/calendar:feature/noid/merge_calendar_subscription_listCopy head branch name to clipboard