Commit 91ee990c authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/15.08'

Conflicts:
	calendarsupport/next/incidenceviewer.h
parents 3984b746 cd57ed32
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment