diff options
| author | Kali Kaneko <kali@leap.se> | 2013-11-05 11:55:02 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-11-05 11:55:02 -0200 |
| commit | af89e2870bc0e54de50e245ea77a2d7eba081730 (patch) | |
| tree | 7b5dbf04ee0cf188430dd82058c1c68fe825d5ab /pkg | |
| parent | 945ab736c7ce9d15a38fe138f4d2181eb2e65285 (diff) | |
| parent | 440a79fb330ffda37ed987cdc7e74333ed99266f (diff) | |
Merge tag '0.3.3' into debian
Tag leap.mx version 0.3.3
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 06a2cd6..4242ad4 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -8,5 +8,8 @@ paisley>=0.3.1 # for the time being. couchdb +leap.common>=0.3.5 leap.soledad.common>=0.3.0 leap.keymanager>=0.3.4 + +cchardet # we fallback to chardet if this is not available, but it's preferred |