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

# Conflicts: # src/page.h
8 years ago · 457918fc59
parent 91c7dc7b51 67f361f47c
commit 457918fc59
1 changed files with 2 additions and 0 deletions
--- a/src/page.h
+++ b/src/page.h
@ -1578,6 +1578,8 @@ public:
                has_mixin_outputs = found_something;
                has_mixin_outputs = found_something;
            } // for (const cryptonote::output_data_t& output_data: mixin_outputs)