Commit graph

56 commits

Author SHA1 Message Date
Job Evers-Meltzer
1e4b5cb450 rename test files 2016-09-27 11:18:52 -07:00
Job Evers-Meltzer
a9da6e4bdf run sed on tests too 2016-09-27 11:18:52 -07:00
Jack
80837cb040 Merge branch 'master' into content_type
fix conflicts:
	lbrynet/lbrynet_daemon/LBRYPublisher.py
2016-08-25 17:59:20 -04:00
Jack
cc1b3609a1 Merge branch 'master' into reflector
# Conflicts:
#	lbrynet/__init__.py
2016-08-17 19:01:38 -04:00
Job Evers-Meltzer
35481a92f5 actually cleanup patched time.time 2016-08-10 19:36:52 -05:00
Job Evers-Meltzer
d172d43ddf add reflector functional test to travis 2016-08-10 08:29:44 -05:00