Merge branch 'git' of github.com:cristen/Radicale into git

Browse Source

Conflicts:
	config

...

This commit is contained in:

Jean-Marc Martins 2013-09-13 17:27:32 +02:00

parent fe28b040bd 369477b9e5

commit cb408e9475

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available