mirror of https://github.com/TriliumNext/Notes
Merge remote-tracking branch 'origin/stable'
# Conflicts: # src/public/javascripts/desktop.js # src/public/stylesheets/style.css # src/views/details/image.ejs # src/views/details/relation_map.ejspull/255/head
commit
53f5df4e88
Loading…
Reference in New Issue