ICAL: add conflict handling
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Nov 2012 13:24:22 +0000 (14:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Nov 2012 13:24:22 +0000 (14:24 +0100)
commitb7f1665b64318cee1b14d13f7e9fdb6a323189a4
tree1cce0fe6da914df9d22ecd13b85aec056858294f
parent1598983613cc27cab89d9036062ce6d17eb286d5
ICAL: add conflict handling
webcit/static/t/ical/attachment/display.html
webcit/static/t/ical/attachment/display_conflict.html [new file with mode: 0644]