← Back to branch summary

~michihenning/storage-framework/check-server-side-metadata

~michihenning/storage-framework/check-server-side-metadata

Viewing all changes in revision 55.

Committer: James Henstridge
Date: 2016-08-18 09:25:51 UTC
mfrom: (8.2.2 storage-framework)
Revision ID: james@jamesh.id.au-20160818092551-9fmvmfctwwxp7zvx

Merge lp:storage-framework into devel, fixing conflicts.

files modified:
debian/changelog

debian/control

demo/provider_test/provider-test.cpp

src/provider/internal/DBusPeerCache.cpp

src/qt/client/internal/local_client/UploaderImpl.cpp

tests/local-client/local-client_test.cpp

tests/remote-client/remote-client_test.cpp

tests/utils/fake-online-accounts-daemon.py

Show diffs side-by-side

added added

removed removed

debian/changelog

demo/provider_test/provider-test.cpp

src/provider/internal/DBusPeerCache.cpp

src/qt/client/internal/local_client/UploaderImpl.cpp

tests/local-client/local-client_test.cpp

tests/remote-client/remote-client_test.cpp

tests/utils/fake-online-accounts-daemon.py

Older »