Skip to content
Snippets Groups Projects
Commit f9520845 authored by Lukas's avatar Lukas
Browse files

Merge branch 'develop' into lbudginas/#340_add_virtual_ops_block_and_transaction_pages

parents e7e9b67c 9cea9c6f
No related branches found
No related tags found
2 merge requests!481bring recent develop changes to mater to match the backend,!463Lbudginas/#340 add virtual ops block and transaction pages
Hide whitespace changes
Inline Side-by-side
Showing
with 359 additions and 79 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment