tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	radicale/__init__.py
	radicale/acl/courier.py
This commit is contained in:
Matthias Jordan
2012-08-04 11:27:51 +02:00
parent e40e68b528 7d06d1b4d5
commit 55a13d4c39
8 changed files with 83 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,4 @@
#Sat Aug 04 10:58:22 CEST 2012
eclipse.preferences.version=1
encoding//radicale/__init__.py=utf-8
encoding//radicale/__main__.py=utf-8