2 commits

Author	SHA1	Message	Date
Jack	71b989b29b	update from master ... resolve merge conflicts: lbrynet/core/client/BlobRequester.py lbrynet/core/Peer.py lbrynet/lbryfilemanager/EncryptedFileManager.py lbrynet/lbrynet_daemon/Daemon.py lbrynet/lbrynet_daemon/Publisher.py	2016-09-29 23:34:59 -04:00
Job Evers-Meltzer	eb783b6b6f	rename File to EncryptedFile	2016-09-27 11:26:01 -07:00

Renamed from lbrynet/lbryfilemanager/FileManager.py (Browse further)