I re-pushed after fixing the conflicts now @codebrainz committed 36f44741b5daa67f08c4251c147457b95545ef14 (which is basically exactly the commit I had).
I also cherry-picked 2128bf1be647dfa8f20fd6e00029c9f842e84e77 into master, so the only thing left is the controversial placeholder change. Closing for now. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/1554#issuecomment-410454174
