nuttyartist / notes

Fast and beautiful note-taking app written in C++. Write down your thoughts.
https://notes-foss.com
Mozilla Public License 2.0
3.72k stars 326 forks source link

Merge dev branch into master for Version 2.1.0 #515

Closed nuttyartist closed 1 year ago

nuttyartist commented 1 year ago

Merge dev branch to master for Version 2.1.0

nuttyartist commented 1 year ago

@guihkx Looking good?

nuttyartist commented 1 year ago

@guihkx Should I rebase and merge?

guihkx commented 1 year ago

You could, but there's no point into doing that, IMO (and I think we would lose references to commits that were cited into other commits).

Creating a merge commit is fine.