ICAL: add conflict handling
[citadel.git] / webcit / static / .gitignore
2010-08-15 Wilfried Göesgensignore the icon directory link