Merge branch 'refactor_viewkey' of github.com:moneroexamples/onion-monero-blockchain-explorer into refactor_viewkey

# Conflicts:
#	src/page.h
This commit is contained in:
moneroexamples 2017-01-19 00:07:59 +00:00
commit 457918fc59

View file

@ -1578,6 +1578,8 @@ public:
has_mixin_outputs = found_something;
has_mixin_outputs = found_something; has_mixin_outputs = found_something;
} // for (const cryptonote::output_data_t& output_data: mixin_outputs) } // for (const cryptonote::output_data_t& output_data: mixin_outputs)