11:37:49 <ErCiccionetempor> luigi1111 ping for merges
14:55:34 <plowsof11> ErCiccione (temporary) there where merge conflicts with a localisation PR so ive combined commits inside 2074 - no conflicts after that i think  
14:56:51 <ErCiccionetempor> ok, I will take a look at open PRs tomorrow or wednesday
14:57:34 <plowsof11> thanks!
14:57:46 <plowsof11> it was a tiny 1~ line conflict, but annoying, nothing has changed really 
14:59:02 <plowsof11> 2104 could use a looking at (pulls in new ru translations)
16:15:11 -xmr-pr- davemarchevsky opened pull request #2114: research-lab: Fix link to original whitepaper
16:15:11 -xmr-pr- > https://github.com/monero-project/monero-site/pull/2114