This updates our fork against upstream's master branch (which is HedgeDoc 1.x, develop is for 2.x), which gives us about a year and a half of fixes and improvements.
I propose we reset the default branch on this repo to main/master and try and keep in sync with Hedgedoc 1.x for as long as we can.
Actually, let's progress a default branch called ours (or beta or anything really) and keep master synced with upstream.
This updates our fork against upstream's
master
branch (which is HedgeDoc 1.x,develop
is for 2.x), which gives us about a year and a half of fixes and improvements.I propose we reset the default branch on this repo tomain/master
and try and keep in sync with Hedgedoc 1.x for as long as we can.Actually, let's progress a default branch called
ours
(orbeta
or anything really) and keepmaster
synced with upstream.