Jeromy 0ec9dce19c Merge branch 'master' of github.com:jbenet/go-ipfs into daemon ... Conflicts: core/core.go		2014-09-14 04:22:05 +00:00
..
commands	refactor daemon code, moved commands to core/commands	2014-09-12 21:29:54 +00:00
.gitignore	ignore testdb	2014-07-05 15:04:04 -07:00
core_test.go	fix(config) failing test	2014-09-12 04:20:46 -07:00
core.go	core: Show error when config identity is not set	2014-09-11 17:50:05 -07:00
datastore.go	fix(config) failing test	2014-09-12 04:20:46 -07:00