Closed mmmavis closed 8 years ago
Our current master branch is ~2700 commits behind upstream(Automattic/wp-calypso) which makes it super difficult to rebase & fix merge conflicts.
master
We have decided to start fresh and re-implement features that have been introduced in our fork (i.e., add mozmaker-templates options, preview feature)
More details see https://github.com/mozilla/wp-calypso/pull/40#issuecomment-212197535
mozmaker.css
bootstrap.css
mozmaker-templates
fixed in PR #42
Our current
master
branch is ~2700 commits behind upstream(Automattic/wp-calypso) which makes it super difficult to rebase & fix merge conflicts.We have decided to start fresh and re-implement features that have been introduced in our fork (i.e., add mozmaker-templates options, preview feature)
More details see https://github.com/mozilla/wp-calypso/pull/40#issuecomment-212197535
mozmaker.css
andbootstrap.css
to TinyMCEmozmaker-templates
so that the template options appear on sidebar