diff options
| author | drebs <drebs@leap.se> | 2015-06-04 11:15:28 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-06-04 11:15:28 -0300 |
| commit | b73d45aad428a530917a0f7b2e6e75645376eacc (patch) | |
| tree | 15f0fb29c236fee5ca5ee65fd546d0c08606913d /client/pkg | |
| parent | 289fab7dbeace040cdd6752026870e4d72e8265f (diff) | |
| parent | 9fb1c47ca7da06d6feef6846b812aec28128ed78 (diff) | |
Merge tag '0.7.0' into develop
Tag version 0.7.0.
Conflicts:
client/pkg/requirements.pip
common/pkg/requirements.pip
Diffstat (limited to 'client/pkg')
| -rw-r--r-- | client/pkg/requirements.pip | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 70f5b3ba..26f7c979 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -1,4 +1,4 @@ -pysqlcipher +pysqlcipher>2.6.3 simplejson u1db scrypt |