soledad.git - [soledad]

diff options

author	Micah Anderson <micah@riseup.net>	2013-08-22 14:45:35 -0400
committer	Micah Anderson <micah@riseup.net>	2013-08-22 14:45:35 -0400
commit	74e3e8ce861d20edc19ac7f858ba0f016f73b1b2 (patch)
tree	12f3530b968837a26e49e339843eb2fba9b466dc /debian/pydist-overrides
parent	ae049361d2eead016ac2a963add0516494ef5a72 (diff)
parent	59f337a29202bb80287a31d6c5b942b74375f33f (diff)

Merge remote-tracking branch 'origin/develop' into debian

Conflicts: client/src/leap/__init__.py client/src/leap/soledad/client/__init__.py client/src/leap/soledad/client/auth.py client/src/leap/soledad/client/crypto.py client/src/leap/soledad/client/shared_db.py client/src/leap/soledad/client/sqlcipher.py client/src/leap/soledad/client/target.py common/src/leap/soledad/common/couch.py common/src/leap/soledad/common/crypto.py common/src/leap/soledad/common/objectstore.py common/src/leap/soledad/common/tests/__init__.py common/src/leap/soledad/common/tests/couchdb.ini.template common/src/leap/soledad/common/tests/test_couch.py common/src/leap/soledad/common/tests/test_server.py common/src/leap/soledad/common/tests/test_soledad.py common/src/leap/soledad/common/tests/test_sqlcipher.py common/src/leap/soledad/common/tests/test_target.py common/src/leap/soledad/common/tests/u1db_tests/README common/src/leap/soledad/common/tests/u1db_tests/__init__.py common/src/leap/soledad/common/tests/u1db_tests/test_backends.py common/src/leap/soledad/common/tests/u1db_tests/test_document.py common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py common/src/leap/soledad/common/tests/u1db_tests/test_https.py common/src/leap/soledad/common/tests/u1db_tests/test_open.py common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py common/src/leap/soledad/common/tests/u1db_tests/test_sync.py common/src/leap/soledad/common/tests/u1db_tests/testing-certs/Makefile common/src/leap/soledad/common/tests/u1db_tests/testing-certs/cacert.pem common/src/leap/soledad/common/tests/u1db_tests/testing-certs/testing.cert common/src/leap/soledad/common/tests/u1db_tests/testing-certs/testing.key pkg/soledad server/pkg/soledad server/setup.py server/src/leap/soledad/server/auth.py setup.py soledad/setup.py soledad/src/leap/__init__.py soledad/src/leap/soledad/__init__.py soledad/src/leap/soledad/auth.py soledad/src/leap/soledad/crypto.py soledad/src/leap/soledad/shared_db.py soledad/src/leap/soledad/sqlcipher.py soledad/src/leap/soledad/target.py soledad/src/leap/soledad/tests/__init__.py soledad/src/leap/soledad/tests/couchdb.ini.template soledad/src/leap/soledad/tests/test_couch.py soledad/src/leap/soledad/tests/test_crypto.py soledad/src/leap/soledad/tests/test_server.py soledad/src/leap/soledad/tests/test_soledad.py soledad/src/leap/soledad/tests/test_sqlcipher.py soledad/src/leap/soledad/tests/test_target.py soledad/src/leap/soledad/tests/u1db_tests/README soledad/src/leap/soledad/tests/u1db_tests/__init__.py soledad/src/leap/soledad/tests/u1db_tests/test_backends.py soledad/src/leap/soledad/tests/u1db_tests/test_document.py soledad/src/leap/soledad/tests/u1db_tests/test_http_app.py soledad/src/leap/soledad/tests/u1db_tests/test_http_client.py soledad/src/leap/soledad/tests/u1db_tests/test_http_database.py soledad/src/leap/soledad/tests/u1db_tests/test_https.py soledad/src/leap/soledad/tests/u1db_tests/test_open.py soledad/src/leap/soledad/tests/u1db_tests/test_remote_sync_target.py soledad/src/leap/soledad/tests/u1db_tests/test_sqlite_backend.py soledad/src/leap/soledad/tests/u1db_tests/test_sync.py soledad/src/leap/soledad/tests/u1db_tests/testing-certs/Makefile soledad/src/leap/soledad/tests/u1db_tests/testing-certs/cacert.pem soledad/src/leap/soledad/tests/u1db_tests/testing-certs/testing.cert soledad/src/leap/soledad/tests/u1db_tests/testing-certs/testing.key soledad_server/pkg/soledad soledad_server/src/leap/soledad_server/auth.py soledad_server/src/leap/soledad_server/couch.py soledad_server/src/leap/soledad_server/objectstore.py src/leap/__init__.py src/leap/soledad/__init__.py src/leap/soledad/auth.py src/leap/soledad/backends/couch.py src/leap/soledad/backends/leap_backend.py src/leap/soledad/backends/objectstore.py src/leap/soledad/backends/sqlcipher.py src/leap/soledad/crypto.py src/leap/soledad/server.py src/leap/soledad/shared_db.py src/leap/soledad/tests/__init__.py src/leap/soledad/tests/couchdb.ini.template src/leap/soledad/tests/test_couch.py src/leap/soledad/tests/test_leap_backend.py src/leap/soledad/tests/test_server.py src/leap/soledad/tests/test_soledad.py src/leap/soledad/tests/test_sqlcipher.py src/leap/soledad/tests/u1db_tests/README src/leap/soledad/tests/u1db_tests/__init__.py src/leap/soledad/tests/u1db_tests/test_backends.py src/leap/soledad/tests/u1db_tests/test_document.py src/leap/soledad/tests/u1db_tests/test_http_app.py src/leap/soledad/tests/u1db_tests/test_http_client.py src/leap/soledad/tests/u1db_tests/test_http_database.py src/leap/soledad/tests/u1db_tests/test_https.py src/leap/soledad/tests/u1db_tests/test_open.py src/leap/soledad/tests/u1db_tests/test_remote_sync_target.py src/leap/soledad/tests/u1db_tests/test_sqlite_backend.py src/leap/soledad/tests/u1db_tests/test_sync.py src/leap/soledad/tests/u1db_tests/testing-certs/Makefile src/leap/soledad/tests/u1db_tests/testing-certs/cacert.pem src/leap/soledad/tests/u1db_tests/testing-certs/testing.cert src/leap/soledad/tests/u1db_tests/testing-certs/testing.key

Diffstat (limited to 'debian/pydist-overrides')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: