Matthias Jordan 55a13d4c39 Merge remote-tracking branch 'upstream/master' ... Conflicts: radicale/__init__.py radicale/acl/courier.py		2012-08-04 11:27:51 +02:00
..
acl	Merge remote-tracking branch 'upstream/master'	2012-08-04 11:27:51 +02:00
authorization	Separation of authentication and authorization. Separation of read and write authorization.	2012-08-03 13:10:20 +02:00
storage	Use " instead of ' (you can laugh at me)	2012-03-01 10:40:15 +01:00
__init__.py	Merge remote-tracking branch 'upstream/master'	2012-08-04 11:27:51 +02:00
__main__.py	Don't start Radicale when PID file exists (fixes #890)	2012-08-03 00:29:06 +02:00
access.py	Separation of authentication and authorization. Separation of read and write authorization.	2012-08-03 13:10:20 +02:00
config.py	Enhance readability according to PEP8	2012-08-03 14:08:11 +02:00
ical.py	Use " instead of ' (you can laugh at me)	2012-03-01 10:40:15 +01:00
log.py	Merge branch 'carddav', and update copyright dates	2012-01-23 16:21:30 +01:00
xmlutils.py	Merge remote-tracking branch 'upstream/master'	2012-08-04 11:27:51 +02:00