mirror of https://github.com/TriliumNext/Notes
Merge remote-tracking branch 'origin/stable'
# Conflicts: # src/public/javascripts/services/note_detail_code.jspull/255/head
commit
dc4024b6de
# Conflicts: # src/public/javascripts/services/note_detail_code.jspull/255/head