Merge pull request 'Core: rebase to v0.17.1.9' (#286) from tobtoht/feather:v0.17.1.9 into master

Reviewed-on: feather/feather#286
3 years ago · 8c80685686
parent 2771ba8773 fc004aa254
commit 8c80685686
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -30,7 +30,7 @@ if(DEBUG)
    set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()

-set(MONERO_HEAD "8cd4091e7e9fb39072c44db68415746eed047588")
+set(MONERO_HEAD "36cd38434a5198059c5898ff3968e86fd95e897d")
 set(BUILD_GUI_DEPS ON)
 set(ARCH "x86-64")
 set(BUILD_64 ON)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8cd4091e7e9fb39072c44db68415746eed047588
+Subproject commit 36cd38434a5198059c5898ff3968e86fd95e897d